From c64ecb3a2bab4543f7916ad87a011f11265c7e55 Mon Sep 17 00:00:00 2001 From: Paul Mackerras Date: Fri, 9 Mar 2001 00:55:14 +0000 Subject: [PATCH] move the option printing stuff a little earlier, take out unnecessary openlog from sys_init in sys_linux.c --- pppd/main.c | 23 ++++++++++++----------- pppd/sys-linux.c | 5 ----- 2 files changed, 12 insertions(+), 16 deletions(-) diff --git a/pppd/main.c b/pppd/main.c index 24f88ec..a6f4e06 100644 --- a/pppd/main.c +++ b/pppd/main.c @@ -17,7 +17,7 @@ * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. */ -#define RCSID "$Id: main.c,v 1.103 2001/03/08 05:11:14 paulus Exp $" +#define RCSID "$Id: main.c,v 1.104 2001/03/09 00:55:14 paulus Exp $" #include #include @@ -304,11 +304,8 @@ main(argc, argv) if (the_channel->process_extra_options) (*the_channel->process_extra_options)(); - if (dump_options || dryrun) { - init_pr_log(NULL, LOG_INFO); - print_options(pr_log, NULL); - end_pr_log(); - } + if (debug) + setlogmask(LOG_UPTO(LOG_DEBUG)); /* * Check that we are running as root. @@ -340,15 +337,19 @@ main(argc, argv) if (the_channel->check_options) (*the_channel->check_options)(); + + if (dump_options || dryrun) { + init_pr_log(NULL, LOG_INFO); + print_options(pr_log, NULL); + end_pr_log(); + if (dryrun) + die(0); + } + /* * Initialize system-dependent stuff. */ sys_init(); - if (debug) - setlogmask(LOG_UPTO(LOG_DEBUG)); - - if (dryrun) - die(0); pppdb = tdb_open(_PATH_PPPDB, 0, 0, O_RDWR|O_CREAT, 0644); if (pppdb != NULL) { diff --git a/pppd/sys-linux.c b/pppd/sys-linux.c index d5dbfaf..017248b 100644 --- a/pppd/sys-linux.c +++ b/pppd/sys-linux.c @@ -263,11 +263,6 @@ void sys_init(void) { int flags; - openlog("pppd", LOG_PID | LOG_NDELAY, LOG_PPP); - setlogmask(LOG_UPTO(LOG_INFO)); - if (debug) - setlogmask(LOG_UPTO(LOG_DEBUG)); - if (new_style_driver) { ppp_dev_fd = open("/dev/ppp", O_RDWR); if (ppp_dev_fd < 0) -- 2.39.2