summaryrefslogtreecommitdiff
path: root/usr.sbin
diff options
context:
space:
mode:
Diffstat (limited to 'usr.sbin')
-rw-r--r--usr.sbin/pppd/auth.c4
-rw-r--r--usr.sbin/pppd/options.c4
2 files changed, 2 insertions, 6 deletions
diff --git a/usr.sbin/pppd/auth.c b/usr.sbin/pppd/auth.c
index eb377517fdb..ea655015fbf 100644
--- a/usr.sbin/pppd/auth.c
+++ b/usr.sbin/pppd/auth.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: auth.c,v 1.31 2009/10/27 23:59:53 deraadt Exp $ */
+/* $OpenBSD: auth.c,v 1.32 2011/10/02 06:25:53 nicm Exp $ */
/*
* auth.c - PPP authentication and phase control.
@@ -1038,11 +1038,9 @@ get_pap_passwd(passwd)
char *filename;
FILE *f;
int ret;
- struct wordlist *addrs;
char secret[MAXWORDLEN];
filename = _PATH_UPAPFILE;
- addrs = NULL;
f = fopen(filename, "r");
if (f == NULL)
return 0;
diff --git a/usr.sbin/pppd/options.c b/usr.sbin/pppd/options.c
index 8dbcc133da2..e0d708b7b86 100644
--- a/usr.sbin/pppd/options.c
+++ b/usr.sbin/pppd/options.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: options.c,v 1.24 2009/10/27 23:59:53 deraadt Exp $ */
+/* $OpenBSD: options.c,v 1.25 2011/10/02 06:25:53 nicm Exp $ */
/*
* options.c - handles option processing for PPP.
@@ -112,8 +112,6 @@ int maxconnect = 0; /* Maximum connect time */
char user[MAXNAMELEN]; /* Username for PAP */
char passwd[MAXSECRETLEN]; /* Password for PAP */
int auth_required = 0; /* Peer is required to authenticate */
-int defaultroute = 0; /* assign default route through interface */
-int proxyarp = 0; /* Set up proxy ARP entry for peer */
int persist = 0; /* Reopen link after it goes down */
int uselogin = 0; /* Use /etc/passwd for checking PAP */
int lcp_echo_interval = 0; /* Interval between LCP echo-requests */