diff options
| author | Paul Mackerras <paulus@samba.org> | 1999-04-01 07:08:49 +0000 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 1999-04-01 07:08:49 +0000 |
| commit | 52e781b87df66bd5a4eb075791f4d91604016144 (patch) | |
| tree | 695fd6f511c0d5b50c823626d124d1c896355ac4 | |
| parent | daf25780c53da49a0b802242d436c778043d8b56 (diff) | |
| download | ppp-52e781b87df66bd5a4eb075791f4d91604016144.tar.gz | |
small changes suggested by Seth Chaiklin
| -rw-r--r-- | pppd/auth.c | 4 | ||||
| -rw-r--r-- | pppd/ipxcp.c | 4 | ||||
| -rw-r--r-- | pppd/main.c | 6 | ||||
| -rw-r--r-- | pppd/ppp.pam | 8 |
4 files changed, 11 insertions, 11 deletions
diff --git a/pppd/auth.c b/pppd/auth.c index e26d36a..778397d 100644 --- a/pppd/auth.c +++ b/pppd/auth.c @@ -33,7 +33,7 @@ */ #ifndef lint -static char rcsid[] = "$Id: auth.c,v 1.49 1999/03/31 05:39:42 paulus Exp $"; +static char rcsid[] = "$Id: auth.c,v 1.50 1999/04/01 07:08:47 paulus Exp $"; #endif #include <stdio.h> @@ -623,7 +623,7 @@ check_idle(arg) itime = MIN(idle.xmit_idle, idle.recv_idle); if (itime >= idle_time_limit) { /* link is idle: shut it down. */ - info("Terminating connection due to lack of activity."); + notice("Terminating connection due to lack of activity."); lcp_close(0, "Link inactive"); } else { TIMEOUT(check_idle, NULL, idle_time_limit - itime); diff --git a/pppd/ipxcp.c b/pppd/ipxcp.c index 91cad49..c938904 100644 --- a/pppd/ipxcp.c +++ b/pppd/ipxcp.c @@ -19,7 +19,7 @@ #ifdef IPX_CHANGE #ifndef lint -static char rcsid[] = "$Id: ipxcp.c,v 1.14 1999/03/22 05:55:31 paulus Exp $"; +static char rcsid[] = "$Id: ipxcp.c,v 1.15 1999/04/01 07:08:47 paulus Exp $"; #endif /* @@ -101,7 +101,7 @@ static option_t ipxcp_option_list[] = { "Disable IPXCP (and IPX)" }, { "-ipx", o_bool, &ipxcp_protent.enabled_flag, "Disable IPXCP (and IPX)" } , - { "ipx-network", o_int, &ipxcp_wantoptions[0].our_network, + { "ipx-network", o_uint32, &ipxcp_wantoptions[0].our_network, "Set our IPX network number", 0, &ipxcp_wantoptions[0].neg_nn }, { "ipxcp-accept-network", o_bool, &ipxcp_wantoptions[0].accept_network, "Accept peer IPX network number", 1, diff --git a/pppd/main.c b/pppd/main.c index d743b96..1b35cd1 100644 --- a/pppd/main.c +++ b/pppd/main.c @@ -18,7 +18,7 @@ */ #ifndef lint -static char rcsid[] = "$Id: main.c,v 1.71 1999/03/31 12:30:01 paulus Exp $"; +static char rcsid[] = "$Id: main.c,v 1.72 1999/04/01 07:08:48 paulus Exp $"; #endif #include <stdio.h> @@ -1536,8 +1536,8 @@ reap_kids(waitfor) warn("Child process %s (pid %d) terminated with signal %d", (chp? chp->prog: "??"), pid, WTERMSIG(status)); } else if (debug) - dbglog("process %d (%s) finished, status = 0x%x", - pid, (chp? chp->prog: "??"), status); + dbglog("Script %s finished (pid %d), status = 0x%x", + (chp? chp->prog: "??"), pid, status); if (chp && chp->done) (*chp->done)(chp->arg); } diff --git a/pppd/ppp.pam b/pppd/ppp.pam index b91142b..5436be4 100644 --- a/pppd/ppp.pam +++ b/pppd/ppp.pam @@ -1,6 +1,6 @@ #%PAM-1.0 # Information for the PPPD process with the 'login' option. -auth required /lib/security/pam_pwdb.so shadow nullok -auth required /lib/security/pam_nologin.so -account required /lib/security/pam_permit.so -session required /lib/security/pam_permit.so +auth required pam_nologin.so +auth required pam_pwdb.so shadow nullok +account required pam_permit.so +session required pam_permit.so |