add shadow support, fix null login problem

[ppp.git] / pppd / auth.c

diff --git a/pppd/auth.c b/pppd/auth.c
index 9a04ecf53793edc646520e59b8038dae0aa43164..5660bcb325247ee8b8356a8ca6c2ff7301e57eac 100644 (file)
--- a/pppd/auth.c
+++ b/pppd/auth.c
@@ -33,11 +33,12 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id: auth.c,v 1.5 1994/05/24 11:20:26 paulus Exp $";
+static char rcsid[] = "$Id: auth.c,v 1.13 1995/04/24 06:01:54 paulus Exp $";
 #endif
 
 #include <stdio.h>
 #include <stddef.h>
+#include <stdlib.h>
 #include <syslog.h>
 #include <pwd.h>
 #include <string.h>
@@ -48,21 +49,25 @@ static char rcsid[] = "$Id: auth.c,v 1.5 1994/05/24 11:20:26 paulus Exp $";
 #include <netinet/in.h>
 #include <arpa/inet.h>
 
-#include "ppp.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"
 #include "upap.h"
 #include "chap.h"
 #include "ipcp.h"
+#include "ccp.h"
 #include "pathnames.h"
 
 #ifdef sparc
 #include <alloca.h>
-#ifndef __GNUC__
-/* why alloca.h doesn't define what alloca() returns is a mystery */
-/* char *alloca __ARGS((int)); */
-#endif /*__GNUC__*/
 #endif /*sparc*/
 
 /* Used for storing a sequence of words.  Usually malloced. */
@@ -80,20 +85,10 @@ struct wordlist {
 #define FALSE  0
 #define TRUE   1
 
-extern char user[];
-extern char passwd[];
-extern char devname[];
-extern char our_name[];
-extern char remote_name[];
-extern char hostname[];
-extern int uselogin;
-extern int usehostname;
-extern int auth_required;
-
 /* Records which authentication operations haven't completed yet. */
-static int auth_pending[NPPP];
+static int auth_pending[NUM_PPP];
 static int logged_in;
-static struct wordlist *addresses[NPPP];
+static struct wordlist *addresses[NUM_PPP];
 
 /* Bits in auth_pending[] */
 #define UPAP_WITHPEER  1
@@ -102,19 +97,20 @@ static struct wordlist *addresses[NPPP];
 #define CHAP_PEER      8
 
 /* Prototypes */
-void check_access __ARGS((FILE *, char *));
-
-static int  login __ARGS((char *, char *, char **, int *));
-static void logout __ARGS((void));
-static int  null_login __ARGS((int));
-static int  get_upap_passwd __ARGS((void));
-static int  have_upap_secret __ARGS((void));
-static int  have_chap_secret __ARGS((char *, char *));
-static int  scan_authfile __ARGS((FILE *, char *, char *, char *,
+void check_access __P((FILE *, char *));
+
+static void network_phase __P((int));
+static int  login __P((char *, char *, char **, int *));
+static void logout __P((void));
+static int  null_login __P((int));
+static int  get_upap_passwd __P((void));
+static int  have_upap_secret __P((void));
+static int  have_chap_secret __P((char *, char *));
+static int  scan_authfile __P((FILE *, char *, char *, char *,
                                  struct wordlist **, char *));
-static void free_wordlist __ARGS((struct wordlist *));
+static void free_wordlist __P((struct wordlist *));
 
-extern char *crypt __ARGS((char *, char *));
+extern char *crypt __P((char *, char *));
 
 /*
  * An Open on LCP has requested a change from Dead to Establish phase.
@@ -134,6 +130,8 @@ void
 link_terminated(unit)
     int unit;
 {
+    if (phase == PHASE_DEAD)
+       return;
     if (logged_in)
        logout();
     phase = PHASE_DEAD;
@@ -147,6 +145,8 @@ void
 link_down(unit)
     int unit;
 {
+    ipcp_close(0);
+    ccp_close(0);
     phase = PHASE_TERMINATE;
 }
 
@@ -169,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;
@@ -195,10 +195,20 @@ link_established(unit)
     }
     auth_pending[unit] = auth;
 
-    if (!auth) {
-       phase = PHASE_NETWORK;
-       ipcp_open(unit);
-    }
+    if (!auth)
+       network_phase(unit);
+}
+
+/*
+ * Proceed to the network phase.
+ */
+static void
+network_phase(unit)
+    int unit;
+{
+    phase = PHASE_NETWORK;
+    ipcp_open(unit);
+    ccp_open(unit);
 }
 
 /*
@@ -225,10 +235,10 @@ auth_peer_success(unit, protocol)
     int bit;
 
     switch (protocol) {
-    case CHAP:
+    case PPP_CHAP:
        bit = CHAP_PEER;
        break;
-    case UPAP:
+    case PPP_PAP:
        bit = UPAP_PEER;
        break;
     default:
@@ -244,6 +254,7 @@ auth_peer_success(unit, protocol)
     if ((auth_pending[unit] &= ~bit) == 0) {
        phase = PHASE_NETWORK;
        ipcp_open(unit);
+       ccp_open(unit);
     }
 }
 
@@ -271,10 +282,10 @@ auth_withpeer_success(unit, protocol)
     int bit;
 
     switch (protocol) {
-    case CHAP:
+    case PPP_CHAP:
        bit = CHAP_WITHPEER;
        break;
-    case UPAP:
+    case PPP_PAP:
        bit = UPAP_WITHPEER;
        break;
     default:
@@ -287,10 +298,8 @@ auth_withpeer_success(unit, protocol)
      * If there is no more authentication still being done,
      * proceed to the network phase.
      */
-    if ((auth_pending[unit] &= ~bit) == 0) {
-       phase = PHASE_NETWORK;
-       ipcp_open(unit);
-    }
+    if ((auth_pending[unit] &= ~bit) == 0)
+       network_phase(unit);
 }
 
 
@@ -415,7 +424,7 @@ check_passwd(unit, auser, userlen, apasswd, passwdlen, msg, msglen)
         */
        if (attempts++ >= 10) {
            syslog(LOG_WARNING, "%d LOGIN FAILURES ON %s, %s",
-                  attempts, devname, user);
+                  attempts, devnam, user);
            quit();
        }
        if (attempts > 3)
@@ -456,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.
      */
@@ -467,19 +489,27 @@ 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);
 
     /*
      * Write a wtmp entry for this user.
      */
-    tty = strrchr(devname, '/');
+    tty = strrchr(devnam, '/');
     if (tty == NULL)
-       tty = devname;
+       tty = devnam;
     else
        tty++;
     logwtmp(tty, user, "");            /* Add wtmp login entry */
@@ -496,9 +526,9 @@ logout()
 {
     char *tty;
 
-    tty = strrchr(devname, '/');
+    tty = strrchr(devnam, '/');
     if (tty == NULL)
-       tty = devname;
+       tty = devnam;
     else
        tty++;
     logwtmp(tty, "", "");              /* Wipe out wtmp logout entry */
@@ -692,9 +722,9 @@ get_secret(unit, client, server, secret, secret_len, save_addrs)
 int
 auth_ip_addr(unit, addr)
     int unit;
-    u_long addr;
+    u_int32_t addr;
 {
-    u_long a;
+    u_int32_t a;
     struct hostent *hp;
     struct wordlist *addrs;
 
@@ -715,7 +745,7 @@ auth_ip_addr(unit, addr)
                       addrs->word);
                continue;
            } else
-               a = *(u_long *)hp->h_addr;
+               a = *(u_int32_t *)hp->h_addr;
        }
        if (addr == a)
            return 1;
@@ -730,7 +760,7 @@ auth_ip_addr(unit, addr)
  */
 int
 bad_ip_adrs(addr)
-    u_long addr;
+    u_int32_t addr;
 {
     addr = ntohl(addr);
     return (addr >> IN_CLASSA_NSHIFT) == IN_LOOPBACKNET