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 986c67aa4419ae8394c1ebf320bfe95993cbb759..e25ae78e7872b1075dc2113a15f5a06583805437 100644 (file)
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,3 +1,8 @@
+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

diff --git a/lib/command.c b/lib/command.c
index 188296722e650c2a20fcf53e31ab533e6f152195..cabdb2374dd2a495495b214c0a0b47ded174bc96 100644 (file)
--- 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 @@ config_write_host (struct vty *vty)
     }
 
   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))
     {