summaryrefslogtreecommitdiff
path: root/ospf6d
diff options
context:
space:
mode:
Diffstat (limited to 'ospf6d')
-rw-r--r--ospf6d/ChangeLog6
-rw-r--r--ospf6d/ospf6_main.c8
2 files changed, 7 insertions, 7 deletions
diff --git a/ospf6d/ChangeLog b/ospf6d/ChangeLog
index 7bb6b4bf..a3e8c949 100644
--- a/ospf6d/ChangeLog
+++ b/ospf6d/ChangeLog
@@ -1,3 +1,9 @@
+2004-12-07 Andrew J. Schorr <ajschorr@alumni.princeton.edu>
+
+ * ospf6_main.c: (main) The 2nd argument to openzlog has been removed.
+ Note that stdout logging will no longer be enabled by default when
+ not running as a daemon.
+
2004-12-03 Andrew J. Schorr <ajschorr@alumni.princeton.edu>
* ospf6_main.c: (sigint,sigterm) Use zlog_notice for termination
diff --git a/ospf6d/ospf6_main.c b/ospf6d/ospf6_main.c
index ba266d95..073e9d68 100644
--- a/ospf6d/ospf6_main.c
+++ b/ospf6d/ospf6_main.c
@@ -184,7 +184,6 @@ main (int argc, char *argv[], char *envp[])
int vty_port = 0;
char *config_file = NULL;
struct thread thread;
- int flag;
/* Set umask before anything for security */
umask (0027);
@@ -250,12 +249,7 @@ main (int argc, char *argv[], char *envp[])
master = thread_master_create ();
/* Initializations. */
- if (! daemon_mode)
- flag = ZLOG_STDOUT;
- else
- flag = 0;
-
- zlog_default = openzlog (progname, flag, ZLOG_OSPF6,
+ zlog_default = openzlog (progname, ZLOG_OSPF6,
LOG_CONS|LOG_NDELAY|LOG_PID,
LOG_DAEMON);
zprivs_init (&ospf6d_privs);