X-Git-Url: https://git.ozlabs.org/?a=blobdiff_plain;f=pppd%2Fsession.c;h=473e51e1912f63074eb7c1d058a601f17fc2749e;hb=fc0a76c87a123e65b4922008257f5878251f9323;hp=db70b436e8deacbc91084c4d67ef5f59063b4749;hpb=8d07ad78c8a32b9c89bfcea25d775e8440fd4172;p=ppp.git

diff --git a/pppd/session.c b/pppd/session.c
index db70b43..473e51e 100644
--- a/pppd/session.c
+++ b/pppd/session.c
@@ -73,7 +73,9 @@
 #include <string.h>
 #include <pwd.h>
 #include <crypt.h>
+#ifdef HAS_SHADOW
 #include <shadow.h>
+#endif
 #include <time.h>
 #include <utmp.h>
 #include <fcntl.h>
@@ -176,6 +178,7 @@ session_start(flags, user, passwd, ttyName, msg)
     bool try_session = 0;
 #else /* #ifdef USE_PAM */
     struct passwd *pw;
+    char *cbuf;
 #ifdef HAS_SHADOW
     struct spwd *spwd;
     struct spwd *getspnam();
@@ -346,8 +349,10 @@ session_start(flags, user, passwd, ttyName, msg)
 	/*
 	 * If no passwd, don't let them login if we're authenticating.
 	 */
-        if (pw->pw_passwd == NULL || strlen(pw->pw_passwd) < 2
-            || strcmp(crypt(passwd, pw->pw_passwd), pw->pw_passwd) != 0)
+        if (pw->pw_passwd == NULL || strlen(pw->pw_passwd) < 2)
+            return SESSION_FAILED;
+	cbuf = crypt(passwd, pw->pw_passwd);
+	if (!cbuf || strcmp(cbuf, pw->pw_passwd) != 0)
             return SESSION_FAILED;
     }
 
@@ -379,8 +384,8 @@ session_start(flags, user, passwd, ttyName, msg)
                 memset((void *)&ll, 0, sizeof(ll));
 		(void)time(&tnow);
                 ll.ll_time = tnow;
-                (void)strncpy(ll.ll_line, ttyName, sizeof(ll.ll_line));
-                (void)strncpy(ll.ll_host, ifname, sizeof(ll.ll_host));
+                strlcpy(ll.ll_line, ttyName, sizeof(ll.ll_line));
+                strlcpy(ll.ll_host, ifname, sizeof(ll.ll_host));
                 (void)write(fd, (char *)&ll, sizeof(ll));
                 (void)close(fd);
             }