From: Paul Mackerras <paulus@samba.org>
Date: Mon, 24 Apr 1995 06:01:54 +0000 (+0000)
Subject: add shadow support, fix null login problem
X-Git-Tag: RELEASE_2_3_6~771
X-Git-Url: https://git.ozlabs.org/?p=ppp.git;a=commitdiff_plain;h=dce1fb57f552c62268f4586f9f5b50a33a41a88c;hp=cd28744f82dfd8cfddc67dcf12ca57b91ca6f4c2

add shadow support, fix null login problem
---

diff --git a/pppd/auth.c b/pppd/auth.c
index 406661b..5660bcb 100644
--- 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.13 1995/04/24 06:01:54 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"
@@ -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;
@@ -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);