2004-12-07 Andrew J. Schorr <ajschorr@alumni.princeton.edu>
* command.c: (config_write_host) Note that "log trap" is deprecated
when writing out the config.
diff --git a/lib/ChangeLog b/lib/ChangeLog
index 986c67a..e25ae78 100644
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,5 +1,10 @@
2004-12-07 Andrew J. Schorr <ajschorr@alumni.princeton.edu>
+ * command.c: (config_write_host) Note that "log trap" is deprecated
+ when writing out the config.
+
+2004-12-07 Andrew J. Schorr <ajschorr@alumni.princeton.edu>
+
* log.h: Replace struct zlog flags and maskpri fields with maxlvl
array to support individual logging levels for each destination.
Remove the 2nd argument to openzlog since the default logging config
diff --git a/lib/command.c b/lib/command.c
index 1882967..cabdb23 100644
--- a/lib/command.c
+++ b/lib/command.c
@@ -1,5 +1,5 @@
/*
- $Id: command.c,v 1.28 2004/12/07 15:39:32 ajs Exp $
+ $Id: command.c,v 1.29 2004/12/07 17:15:56 ajs Exp $
Command interpreter routine for virtual terminal [aka TeletYpe]
Copyright (C) 1997, 98, 99 Kunihiro Ishiguro
@@ -546,8 +546,12 @@
}
if (zlog_default->default_lvl != LOG_DEBUG)
- vty_out (vty, "log trap %s%s",
- zlog_priority[zlog_default->default_lvl], VTY_NEWLINE);
+ {
+ vty_out (vty, "! N.B. The 'log trap' command is deprecated.%s",
+ VTY_NEWLINE);
+ vty_out (vty, "log trap %s%s",
+ zlog_priority[zlog_default->default_lvl], VTY_NEWLINE);
+ }
if (host.logfile && (zlog_default->maxlvl[ZLOG_DEST_FILE] != ZLOG_DISABLED))
{