diff options
| author | hasso <hasso> | 2005-03-07 08:35:39 +0000 |
|---|---|---|
| committer | hasso <hasso> | 2005-03-07 08:35:39 +0000 |
| commit | 779e9fb5fef546ba4799db5daff45d06017be528 (patch) | |
| tree | 8c8fb5e8fe78a2efac5b46ae102cf0ccd07599a2 /lib | |
| parent | 4b489895624207603ef108b2b59b932645ae1feb (diff) | |
| download | quagga-779e9fb5fef546ba4799db5daff45d06017be528.tar.bz2 quagga-779e9fb5fef546ba4799db5daff45d06017be528.tar.xz | |
* 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 | 3 | ||||
| -rw-r--r-- | lib/vty.c | 2 |
3 files changed, 8 insertions, 2 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 020cfec1..26d6821a 100644 --- a/lib/command.c +++ b/lib/command.c @@ -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. */ |