d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to pppd-2.3.1, except for the CLOCAL changes while running the

Browse Source 
connect script to main.c that can cause problems on bsd-style tty systems.
This commit is contained in:
Peter Wemm 1997-08-22 12:03:57 +00:00
parent 080ea4d851
commit 9851597813
4 changed files with 27 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
usr.sbin/pppd/auth.c
View File

@ -33,7 +33,7 @@
*/
#ifndef lint
static char rcsid[] = "$Id$";
static char rcsid[] = "$Id: auth.c,v 1.17 1997/08/19 17:52:31 peter Exp $";
#endif
#include <stdio.h>
@ -312,6 +312,10 @@ network_phase(unit)
if (protp->protocol != PPP_CCP)
++num_np_open;
}
if (num_np_open == 0)
/* nothing to do */
lcp_close(0, "No network protocols running");
}
/*
@ -423,8 +427,14 @@ void
np_up(unit, proto)
int unit, proto;
{
if (num_np_up == 0 && idle_time_limit > 0) {
TIMEOUT(check_idle, NULL, idle_time_limit);
if (num_np_up == 0) {
/*
* At this point we consider that the link has come up successfully.
*/
need_holdoff = 0;
if (idle_time_limit > 0)
TIMEOUT(check_idle, NULL, idle_time_limit);
/*
* Set a timeout to close the connection once the maximum
@ -478,7 +488,6 @@ check_idle(arg)
if (itime >= idle_time_limit) {
/* link is idle: shut it down. */
syslog(LOG_INFO, "Terminating connection due to lack of activity.");
need_holdoff = 0;
lcp_close(0, "Link inactive");
} else {
TIMEOUT(check_idle, NULL, idle_time_limit - itime);
@ -966,6 +975,7 @@ get_pap_passwd(passwd)
{
char *filename;
FILE *f;
int ret;
struct wordlist *addrs;
char secret[MAXWORDLEN];
@ -975,9 +985,11 @@ get_pap_passwd(passwd)
if (f == NULL)
return 0;
check_access(f, filename);
if (scan_authfile(f, user,
remote_name[0]? remote_name: NULL,
(u_int32_t)0, secret, NULL, filename) < 0)
ret = scan_authfile(f, user,
remote_name[0]? remote_name: NULL,
(u_int32_t)0, secret, NULL, filename);
fclose(f);
if (ret < 0)
return 0;
if (passwd != NULL) {
strncpy(passwd, secret, MAXSECRETLEN);

4
usr.sbin/pppd/ipcp.c
View File

@ -18,7 +18,7 @@
*/
#ifndef lint
static char rcsid[] = "$Id$";
static char rcsid[] = "$Id: ipcp.c,v 1.9 1997/08/19 17:52:38 peter Exp $";
#endif
/*
@ -1085,10 +1085,12 @@ ip_check_options()
option_error("remote IP address required for demand-dialling\n");
exit(1);
}
#if 0
if (demand && wo->accept_remote) {
option_error("ipcp-accept-remote is incompatible with demand\n");
exit(1);
}
#endif
}

4
usr.sbin/pppd/main.c
View File

@ -18,7 +18,7 @@
*/
#ifndef lint
static char rcsid[] = "$Id$";
static char rcsid[] = "$Id: main.c,v 1.13 1997/08/19 17:52:43 peter Exp $";
#endif
#include <stdio.h>
@ -487,7 +487,7 @@ main(argc, argv)
while ((i = open(devnam, O_RDWR)) < 0) {
if (errno != EINTR)
syslog(LOG_ERR, "Failed to reopen %s: %m", devnam);
if (!persist || errno != EINTR)
if (!persist || errno != EINTR || hungup || kill_link)
goto fail;
}
close(i);

6
usr.sbin/pppd/patchlevel.h
View File

@ -1,6 +1,6 @@
/* $Id$ */
#define PATCHLEVEL 0
/* $Id: patchlevel.h,v 1.6 1997/08/19 17:52:44 peter Exp $ */
#define PATCHLEVEL 1
#define VERSION "2.3"
#define IMPLEMENTATION ""
#define DATE "22 May 97"
#define DATE "27 June 97"