X-Git-Url: http://git.ozlabs.org/?p=ppp.git;a=blobdiff_plain;f=pppd%2Fauth.c;h=dd9735b89efdf4243b9e133e47517c8cb483de25;hp=b9c28fcafb6abc38ca789436c308831fb9d02799;hb=bc45bd7903b4439e920bc2095b7543dc768f7ff8;hpb=a997ae3e882145f6e99b256eee81396615ea89a5 diff --git a/pppd/auth.c b/pppd/auth.c index b9c28fc..dd9735b 100644 --- a/pppd/auth.c +++ b/pppd/auth.c @@ -33,11 +33,12 @@ */ #ifndef lint -static char rcsid[] = "$Id: auth.c,v 1.9 1994/09/01 00:12:52 paulus Exp $"; +static char rcsid[] = "$Id: auth.c,v 1.17 1995/08/16 01:37:22 paulus Exp $"; #endif #include #include +#include #include #include #include @@ -48,7 +49,14 @@ static char rcsid[] = "$Id: auth.c,v 1.9 1994/09/01 00:12:52 paulus Exp $"; #include #include -#include "ppp.h" +#ifdef HAS_SHADOW +#include +#include +#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.9 1994/09/01 00:12:52 paulus Exp $"; #include "ccp.h" #include "pathnames.h" -#ifdef sparc +#if defined(sun) && defined(sparc) #include #endif /*sparc*/ @@ -78,9 +86,9 @@ struct wordlist { #define TRUE 1 /* 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 @@ -89,20 +97,20 @@ static struct wordlist *addresses[NPPP]; #define CHAP_PEER 8 /* Prototypes */ -void check_access __ARGS((FILE *, char *)); - -static void network_phase __ARGS((int)); -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. @@ -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; @@ -227,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: @@ -274,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: @@ -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,21 +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(devnam, '/'); - if (tty == NULL) - tty = devnam; - else - tty++; + tty = devnam; + if (strncmp(tty, "/dev/", 5) == 0) + tty += 5; logwtmp(tty, user, ""); /* Add wtmp login entry */ logged_in = TRUE; @@ -497,11 +524,9 @@ logout() { char *tty; - tty = strrchr(devnam, '/'); - if (tty == NULL) - tty = devnam; - else - tty++; + tty = devnam; + if (strncmp(tty, "/dev/", 5) == 0) + tty += 5; logwtmp(tty, "", ""); /* Wipe out wtmp logout entry */ logged_in = FALSE; } @@ -693,9 +718,9 @@ get_secret(unit, client, server, secret, secret_len, save_addrs) int auth_ip_addr(unit, addr) int unit; - uint32 addr; + u_int32_t addr; { - uint32 a; + u_int32_t a; struct hostent *hp; struct wordlist *addrs; @@ -716,7 +741,7 @@ auth_ip_addr(unit, addr) addrs->word); continue; } else - a = *(uint32 *)hp->h_addr; + a = *(u_int32_t *)hp->h_addr; } if (addr == a) return 1; @@ -731,7 +756,7 @@ auth_ip_addr(unit, addr) */ int bad_ip_adrs(addr) - uint32 addr; + u_int32_t addr; { addr = ntohl(addr); return (addr >> IN_CLASSA_NSHIFT) == IN_LOOPBACKNET