diff options
| -rw-r--r-- | usr.sbin/bgpd/bgpd.c | 4 | ||||
| -rw-r--r-- | usr.sbin/bgpd/log.c | 3 | ||||
| -rw-r--r-- | usr.sbin/dvmrpd/dvmrpd.c | 4 | ||||
| -rw-r--r-- | usr.sbin/dvmrpd/log.c | 3 | ||||
| -rw-r--r-- | usr.sbin/ldpd/ldpd.c | 5 | ||||
| -rw-r--r-- | usr.sbin/ldpd/log.c | 3 | ||||
| -rw-r--r-- | usr.sbin/ospf6d/log.c | 3 | ||||
| -rw-r--r-- | usr.sbin/ospf6d/ospf6d.c | 4 | ||||
| -rw-r--r-- | usr.sbin/ripd/log.c | 3 | ||||
| -rw-r--r-- | usr.sbin/ripd/ripd.c | 4 |
10 files changed, 20 insertions, 16 deletions
diff --git a/usr.sbin/bgpd/bgpd.c b/usr.sbin/bgpd/bgpd.c index 7a177fab6a2..cc860449726 100644 --- a/usr.sbin/bgpd/bgpd.c +++ b/usr.sbin/bgpd/bgpd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bgpd.c,v 1.167 2011/05/01 10:42:28 claudio Exp $ */ +/* $OpenBSD: bgpd.c,v 1.168 2011/08/20 19:02:28 sthen Exp $ */ /* * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org> @@ -118,6 +118,7 @@ main(int argc, char *argv[]) bgpd_process = PROC_MAIN; log_init(1); /* log to stderr until daemonized */ + log_verbose(1); bzero(&conf, sizeof(conf)); LIST_INIT(&mrt_l); @@ -183,6 +184,7 @@ main(int argc, char *argv[]) errx(1, "unknown user %s", BGPD_USER); log_init(debug); + log_verbose(conf.opts & BGPD_OPT_VERBOSE); if (!debug) daemon(1, 0); diff --git a/usr.sbin/bgpd/log.c b/usr.sbin/bgpd/log.c index 5c2d6909039..6405fd5791c 100644 --- a/usr.sbin/bgpd/log.c +++ b/usr.sbin/bgpd/log.c @@ -1,4 +1,4 @@ -/* $OpenBSD: log.c,v 1.54 2010/11/18 12:51:24 claudio Exp $ */ +/* $OpenBSD: log.c,v 1.55 2011/08/20 19:02:28 sthen Exp $ */ /* * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org> @@ -71,7 +71,6 @@ log_init(int n_debug) extern char *__progname; debug = n_debug; - verbose = n_debug; if (!debug) openlog(__progname, LOG_PID | LOG_NDELAY, LOG_DAEMON); diff --git a/usr.sbin/dvmrpd/dvmrpd.c b/usr.sbin/dvmrpd/dvmrpd.c index b9d7469935a..2fe8bc1b4c8 100644 --- a/usr.sbin/dvmrpd/dvmrpd.c +++ b/usr.sbin/dvmrpd/dvmrpd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dvmrpd.c,v 1.13 2010/02/08 00:36:20 guenther Exp $ */ +/* $OpenBSD: dvmrpd.c,v 1.14 2011/08/20 19:02:28 sthen Exp $ */ /* * Copyright (c) 2005 Claudio Jeker <claudio@openbsd.org> @@ -129,6 +129,7 @@ main(int argc, char *argv[]) dvmrpd_process = PROC_MAIN; log_init(1); /* log to stderr until daemonized */ + log_verbose(1); while ((ch = getopt(argc, argv, "df:nv")) != -1) { switch (ch) { @@ -159,6 +160,7 @@ main(int argc, char *argv[]) usage(); log_init(debug); + log_verbose(opts & DVMRPD_OPT_VERBOSE); /* multicast IP forwarding must be enabled */ mib[0] = CTL_NET; diff --git a/usr.sbin/dvmrpd/log.c b/usr.sbin/dvmrpd/log.c index 5dff3890030..782a8f85d55 100644 --- a/usr.sbin/dvmrpd/log.c +++ b/usr.sbin/dvmrpd/log.c @@ -1,4 +1,4 @@ -/* $OpenBSD: log.c,v 1.2 2009/11/02 20:31:50 claudio Exp $ */ +/* $OpenBSD: log.c,v 1.3 2011/08/20 19:02:28 sthen Exp $ */ /* * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org> @@ -45,7 +45,6 @@ log_init(int n_debug) extern char *__progname; debug = n_debug; - verbose = n_debug; if (!debug) openlog(__progname, LOG_PID | LOG_NDELAY, LOG_DAEMON); diff --git a/usr.sbin/ldpd/ldpd.c b/usr.sbin/ldpd/ldpd.c index 948679fa4fa..3ad0b161273 100644 --- a/usr.sbin/ldpd/ldpd.c +++ b/usr.sbin/ldpd/ldpd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ldpd.c,v 1.12 2010/09/01 13:54:54 claudio Exp $ */ +/* $OpenBSD: ldpd.c,v 1.13 2011/08/20 19:02:28 sthen Exp $ */ /* * Copyright (c) 2005 Claudio Jeker <claudio@openbsd.org> @@ -134,6 +134,7 @@ main(int argc, char *argv[]) ldpd_process = PROC_MAIN; log_init(1); /* log to stderr until daemonized */ + log_verbose(1); while ((ch = getopt(argc, argv, "dD:f:nv")) != -1) { switch (ch) { @@ -155,7 +156,6 @@ main(int argc, char *argv[]) if (opts & LDPD_OPT_VERBOSE) opts |= LDPD_OPT_VERBOSE2; opts |= LDPD_OPT_VERBOSE; - log_verbose(1); break; default: usage(); @@ -189,6 +189,7 @@ main(int argc, char *argv[]) errx(1, "unknown user %s", LDPD_USER); log_init(debug); + log_verbose(opts & LDPD_OPT_VERBOSE); if (!debug) daemon(1, 0); diff --git a/usr.sbin/ldpd/log.c b/usr.sbin/ldpd/log.c index 45e063166bf..ea0befd0462 100644 --- a/usr.sbin/ldpd/log.c +++ b/usr.sbin/ldpd/log.c @@ -1,4 +1,4 @@ -/* $OpenBSD: log.c,v 1.8 2010/09/02 14:34:04 claudio Exp $ */ +/* $OpenBSD: log.c,v 1.9 2011/08/20 19:02:28 sthen Exp $ */ /* * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org> @@ -49,7 +49,6 @@ log_init(int n_debug) extern char *__progname; debug = n_debug; - verbose = n_debug; if (!debug) openlog(__progname, LOG_PID | LOG_NDELAY, LOG_DAEMON); diff --git a/usr.sbin/ospf6d/log.c b/usr.sbin/ospf6d/log.c index 1eab0730003..2e34697b5cb 100644 --- a/usr.sbin/ospf6d/log.c +++ b/usr.sbin/ospf6d/log.c @@ -1,4 +1,4 @@ -/* $OpenBSD: log.c,v 1.6 2009/12/22 17:45:47 claudio Exp $ */ +/* $OpenBSD: log.c,v 1.7 2011/08/20 19:02:28 sthen Exp $ */ /* * Copyright (c) 2006 Claudio Jeker <claudio@openbsd.org> @@ -51,7 +51,6 @@ log_init(int n_debug) extern char *__progname; debug = n_debug; - verbose = n_debug; if (!debug) openlog(__progname, LOG_PID | LOG_NDELAY, LOG_DAEMON); diff --git a/usr.sbin/ospf6d/ospf6d.c b/usr.sbin/ospf6d/ospf6d.c index 68187ef26eb..5583c50479d 100644 --- a/usr.sbin/ospf6d/ospf6d.c +++ b/usr.sbin/ospf6d/ospf6d.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ospf6d.c,v 1.21 2010/08/22 21:15:25 bluhm Exp $ */ +/* $OpenBSD: ospf6d.c,v 1.22 2011/08/20 19:02:28 sthen Exp $ */ /* * Copyright (c) 2005 Claudio Jeker <claudio@openbsd.org> @@ -135,6 +135,7 @@ main(int argc, char *argv[]) ospfd_process = PROC_MAIN; log_init(1); /* log to stderr until daemonized */ + log_verbose(1); while ((ch = getopt(argc, argv, "cdD:f:nv")) != -1) { switch (ch) { @@ -210,6 +211,7 @@ main(int argc, char *argv[]) errx(1, "unknown user %s", OSPF6D_USER); log_init(debug); + log_verbose(ospfd_conf->opts & OSPFD_OPT_VERBOSE); if (!debug) daemon(1, 0); diff --git a/usr.sbin/ripd/log.c b/usr.sbin/ripd/log.c index c66b67838a5..a0ae314d6f7 100644 --- a/usr.sbin/ripd/log.c +++ b/usr.sbin/ripd/log.c @@ -1,4 +1,4 @@ -/* $OpenBSD: log.c,v 1.3 2009/11/02 20:28:49 claudio Exp $ */ +/* $OpenBSD: log.c,v 1.4 2011/08/20 19:02:28 sthen Exp $ */ /* * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org> @@ -44,7 +44,6 @@ log_init(int n_debug) extern char *__progname; debug = n_debug; - verbose = n_debug; if (!debug) openlog(__progname, LOG_PID | LOG_NDELAY, LOG_DAEMON); diff --git a/usr.sbin/ripd/ripd.c b/usr.sbin/ripd/ripd.c index ed0438c8cea..2efe37d293d 100644 --- a/usr.sbin/ripd/ripd.c +++ b/usr.sbin/ripd/ripd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ripd.c,v 1.20 2010/02/08 00:26:51 guenther Exp $ */ +/* $OpenBSD: ripd.c,v 1.21 2011/08/20 19:02:28 sthen Exp $ */ /* * Copyright (c) 2006 Michele Marchetto <mydecay@openbeer.it> @@ -129,6 +129,7 @@ main(int argc, char *argv[]) ripd_process = PROC_MAIN; log_init(1); /* log to stderr until daemonized */ + log_verbose(1); while ((ch = getopt(argc, argv, "cdD:f:nv")) != -1) { switch (ch) { @@ -200,6 +201,7 @@ main(int argc, char *argv[]) errx(1, "unknown user %s", RIPD_USER); log_init(debug); + log_verbose(conf->opts & RIPD_OPT_VERBOSE); if (!debug) daemon(1, 0); |