diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 1996-06-17 07:20:54 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 1996-06-17 07:20:54 +0000 |
| commit | e290014b79f7bd12abe429c4fba0866ce4d4586f (patch) | |
| tree | 83445d00fbd6036618a13f8a1ea246fa7e9966c9 | |
| parent | ddd2b95ac45eaa0bf93d16a9224006ea8be1b038 (diff) | |
parse args before tty options file; netbsd pr#2554; from Davyd.Norris@fcollins.com.au
| -rw-r--r-- | usr.sbin/pppd/main.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/usr.sbin/pppd/main.c b/usr.sbin/pppd/main.c index 7592bf8a596..f7d307941fd 100644 --- a/usr.sbin/pppd/main.c +++ b/usr.sbin/pppd/main.c @@ -1,4 +1,4 @@ -/* $OpenBSD: main.c,v 1.7 1996/05/11 15:41:24 deraadt Exp $ */ +/* $OpenBSD: main.c,v 1.8 1996/06/17 07:20:53 deraadt Exp $ */ /* * main.c - Point-to-Point Protocol main module @@ -20,7 +20,7 @@ */ #ifndef lint -static char rcsid[] = "$OpenBSD: main.c,v 1.7 1996/05/11 15:41:24 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: main.c,v 1.8 1996/06/17 07:20:53 deraadt Exp $"; #endif #include <stdio.h> @@ -177,9 +177,9 @@ main(argc, argv) progname = *argv; if (!options_from_file(_PATH_SYSOPTIONS, REQ_SYSOPTIONS, 0) || - !options_for_tty() || !options_from_user() || - !parse_args(argc-1, argv+1)) + !parse_args(argc-1, argv+1) || + !options_for_tty() ) exit(1); if (!ppp_available()) { |