diff options
| author | hasso <hasso> | 2005-03-07 08:35:39 +0000 |
|---|---|---|
| committer | hasso <hasso> | 2005-03-07 08:35:39 +0000 |
| commit | 12f6ea2300402c821595297ff0c2c75055e50031 (patch) | |
| tree | 503bfaf41cd13b637d8ec21034d896347828a9d7 /lib | |
| parent | 42a66d7c484f95615e0364c4aa109ce5d095776a (diff) | |
* command.c: host.name might be NULL.
* vty.c: Fix fd leak.
[backport candidate]
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/ChangeLog | 5 | ||||
| -rw-r--r-- | lib/command.c | 5 | ||||
| -rw-r--r-- | lib/vty.c | 2 |
3 files changed, 9 insertions, 3 deletions
diff --git a/lib/ChangeLog b/lib/ChangeLog index ea561848..d57aa302 100644 --- a/lib/ChangeLog +++ b/lib/ChangeLog @@ -1,3 +1,8 @@ +2005-03-07 Michael Sandee <voidptr@voidptr.sboost.org> + + * command.c: host.name might be NULL. + * vty.c: Fix fd leak. + 2005-02-24 Andrew J. Schorr <ajschorr@alumni.princeton.edu> * stream.c: (stream_read_try) Log a warning message if a fatal diff --git a/lib/command.c b/lib/command.c index be38fcc0..1e1f3cf5 100644 --- a/lib/command.c +++ b/lib/command.c @@ -1,5 +1,5 @@ /* - $Id: command.c,v 1.36 2005/01/28 20:28:35 ajs Exp $ + $Id: command.c,v 1.37 2005/03/07 08:35:39 hasso Exp $ Command interpreter routine for virtual terminal [aka TeletYpe] Copyright (C) 1997, 98, 99 Kunihiro Ishiguro @@ -2439,7 +2439,8 @@ DEFUN (show_version, SHOW_STR "Displays zebra version\n") { - vty_out (vty, "Quagga %s (%s).%s", QUAGGA_VERSION, host.name, VTY_NEWLINE); + vty_out (vty, "Quagga %s (%s).%s", QUAGGA_VERSION, host.name?host.name:"", + VTY_NEWLINE); vty_out (vty, "%s%s", QUAGGA_COPYRIGHT, VTY_NEWLINE); return CMD_SUCCESS; @@ -2246,7 +2246,7 @@ vty_use_backup_config (char *fullpath) free (fullpath_sav); free (fullpath_tmp); - return fopen (fullpath, "r"); + return ret; } /* Read up configuration file from file_name. */ |