X-Git-Url: https://git.ozlabs.org/?a=blobdiff_plain;f=pppd%2Fauth.c;h=3d232be9dde64064d6f6efc201c9a09be0aec69f;hb=e38fa6a29a90a514ad7dfa8fa873d5fd49bc9ca1;hp=1a8cb34ed0c3b460babd9fd33041854cb90110e2;hpb=aac99e2604e20409d9f0538ceb8590c2f75220a0;p=ppp.git diff --git a/pppd/auth.c b/pppd/auth.c index 1a8cb34..3d232be 100644 --- a/pppd/auth.c +++ b/pppd/auth.c @@ -32,7 +32,7 @@ * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. */ -#define RCSID "$Id: auth.c,v 1.70 2001/04/27 23:13:06 paulus Exp $" +#define RCSID "$Id: auth.c,v 1.72 2002/01/11 18:07:45 etbe Exp $" #include #include @@ -64,6 +64,7 @@ #define PW_PPP PW_LOGIN #endif #endif +#include #include "pppd.h" #include "fsm.h" @@ -741,6 +742,7 @@ np_down(unit, proto) { if (--num_np_up == 0) { UNTIMEOUT(check_idle, NULL); + UNTIMEOUT(connect_time_expired, NULL); new_phase(PHASE_NETWORK); } } @@ -1134,7 +1136,7 @@ plogin(user, passwd, msg) if (pam_error == PAM_SUCCESS && !PAM_error) { pam_error = pam_acct_mgmt (pamh, PAM_SILENT); if (pam_error == PAM_SUCCESS) - pam_open_session (pamh, PAM_SILENT); + pam_error = pam_open_session (pamh, PAM_SILENT); } *msg = (char *) pam_strerror (pamh, pam_error);