Make changes suggested in PR#1825, closing it. Removes default local

hack behavior better than previous commit.
Submitted-By: Peter Childs <pjchilds@imforei.apana.org.au>
This commit is contained in:
Jordan K. Hubbard 1996-10-18 03:47:53 +00:00
parent fddb6f46b4
commit 07eece26e8
2 changed files with 10 additions and 11 deletions

View File

@ -1,4 +1,4 @@
# $Id: Makefile,v 1.7 1996/10/06 13:32:26 jkh Exp $
# $Id: Makefile,v 1.8 1996/10/18 01:44:45 jkh Exp $
PROG= ppp
SRCS= async.c auth.c ccp.c chap.c chat.c command.c filter.c fsm.c hdlc.c \
@ -6,7 +6,7 @@ SRCS= async.c auth.c ccp.c chap.c chat.c command.c filter.c fsm.c hdlc.c \
pap.c pred.c route.c slcompress.c timer.c systems.c uucplock.c vars.c \
vjcomp.c arp.c passwdauth.c
#CFLAGS+= -DHAVE_SHELL_CMD_WITH_ANY_MODE
CFLAGS += -Wall -DUSE_PERROR -DMSEXT -DPASSWDAUTH # -DLOCALHACK
CFLAGS += -Wall -DUSE_PERROR -DMSEXT -DPASSWDAUTH
LDADD += -lmd -lcrypt -lutil
DPADD += ${LIBMD}
MAN8= ppp.8

View File

@ -86,16 +86,15 @@ char *name, *key;
(void)time(&utmp.ut_time);
(void)strncpy(utmp.ut_name, name, sizeof(utmp.ut_name));
#ifdef LOCALHACK
/*
* if the first three chacters are "pap" trim them off before doing
* utmp entry (see sample.ppp-pap-dialup
*/
/* we trim the first three characters off here.. see sample.ppp.conf */
(void)strncpy(utmp.ut_line, (char *)(dstsystem + 3), sizeof(utmp.ut_line));
#else
(void)strncpy(utmp.ut_line, dstsystem, sizeof(utmp.ut_line));
#endif /* LOCALHACK */
if( strncmp( "pap", dstsystem, 3 ) == 0 )
(void)strncpy(utmp.ut_line, (char *)(dstsystem + 3), sizeof(utmp.ut_line));
else
(void)strncpy(utmp.ut_line, dstsystem, sizeof(utmp.ut_line));
(void)strcpy(utmp.ut_host, "auto-ppp" );
login(&utmp);