mods & restructuring to support Solaris 2

[ppp.git] / pppd / auth.c

diff --git a/pppd/auth.c b/pppd/auth.c
index 406661b113b4a97286797fb4f3a3d45211468262..f08fb312abe2b64f90bb4dc5a04a93faa0002664 100644 (file)
--- a/pppd/auth.c
+++ b/pppd/auth.c
@@ -33,7 +33,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id: auth.c,v 1.12 1994/10/24 04:31:11 paulus Exp $";
+static char rcsid[] = "$Id: auth.c,v 1.15 1995/05/19 03:16:12 paulus Exp $";
 #endif
 
 #include <stdio.h>
@@ -49,6 +49,14 @@ static char rcsid[] = "$Id: auth.c,v 1.12 1994/10/24 04:31:11 paulus Exp $";
 #include <netinet/in.h>
 #include <arpa/inet.h>
 
+#ifdef HAS_SHADOW
+#include <shadow.h>
+#include <shadow/pwauth.h>
+#ifndef PW_PPP
+#define PW_PPP PW_LOGIN
+#endif
+#endif
+
 #include "pppd.h"
 #include "fsm.h"
 #include "lcp.h"
@@ -58,7 +66,7 @@ static char rcsid[] = "$Id: auth.c,v 1.12 1994/10/24 04:31:11 paulus Exp $";
 #include "ccp.h"
 #include "pathnames.h"
 
-#ifdef sparc
+#if defined(sparc) && !defined(NeXT)
 #include <alloca.h>
 #endif /*sparc*/
 
@@ -161,7 +169,7 @@ link_established(unit)
         * treat it as though it authenticated with PAP using a username
         * of "" and a password of "".  If that's not OK, boot it out.
         */
-       if (wo->neg_upap && !null_login(unit)) {
+       if (!wo->neg_upap || !null_login(unit)) {
            syslog(LOG_WARNING, "peer refused to authenticate");
            lcp_close(unit);
            phase = PHASE_TERMINATE;
@@ -391,7 +399,7 @@ check_passwd(unit, auser, userlen, apasswd, passwdlen, msg, msglen)
     } else {
        check_access(f, filename);
        if (scan_authfile(f, user, our_name, secret, &addrs, filename) < 0
-           || (secret[0] != 0 && strcmp(passwd, secret) != 0
+           || (secret[0] != 0 && (cryptpap || strcmp(passwd, secret) != 0)
                && strcmp(crypt(passwd, secret), secret) != 0)) {
            syslog(LOG_WARNING, "upap authentication failure for %s", user);
            ret = UPAP_AUTHNAK;
@@ -457,10 +465,23 @@ login(user, passwd, msg, msglen)
     char *epasswd;
     char *tty;
 
+#ifdef HAS_SHADOW
+    struct spwd *spwd;
+    struct spwd *getspnam();
+#endif
+
     if ((pw = getpwnam(user)) == NULL) {
        return (UPAP_AUTHNAK);
     }
 
+#ifdef HAS_SHADOW
+    if ((spwd = getspnam(user)) == NULL) {
+        pw->pw_passwd = "";
+    } else {
+       pw->pw_passwd = spwd->sp_pwdp;
+    }
+#endif
+
     /*
      * XXX If no passwd, let them login without one.
      */
@@ -468,10 +489,18 @@ login(user, passwd, msg, msglen)
        return (UPAP_AUTHACK);
     }
 
+#ifdef HAS_SHADOW
+    if ((pw->pw_passwd && pw->pw_passwd[0] == '@'
+        && pw_auth (pw->pw_passwd+1, pw->pw_name, PW_PPP, NULL))
+       || !valid (passwd, pw)) {
+       return (UPAP_AUTHNAK);
+    }
+#else
     epasswd = crypt(passwd, pw->pw_passwd);
     if (strcmp(epasswd, pw->pw_passwd)) {
        return (UPAP_AUTHNAK);
     }
+#endif
 
     syslog(LOG_INFO, "user %s logged in", user);