summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Jakma <paul.jakma@sun.com>2007-11-13 09:32:23 +0000
committerPaul Jakma <paul.jakma@sun.com>2007-11-13 09:32:23 +0000
commit7e992e95e3fb9453efb6018dca9016139a8396f1 (patch)
tree78ad72764e2334a4a900dd74cc64564ad0a6f5e5
parent6ce80bdb2523ad82cef813f6d8a7e0d4daa8cfae (diff)
[bgpd] small fix for crash if 'listenon' argument is not given
2007-11-13 Paul Jakma <paul.jakma@sun.com> * bgp_main.c: Small fix, format string parameters should never be NULL - it's not strictly valid and some libc's don't let you away with.
-rw-r--r--bgpd/ChangeLog6
-rw-r--r--bgpd/bgp_main.c4
2 files changed, 9 insertions, 1 deletions
diff --git a/bgpd/ChangeLog b/bgpd/ChangeLog
index 0fdd36ac..c1f12d67 100644
--- a/bgpd/ChangeLog
+++ b/bgpd/ChangeLog
@@ -1,3 +1,9 @@
+2007-11-13 Paul Jakma <paul.jakma@sun.com>
+
+ * bgp_main.c: Small fix, format string parameters should never
+ be NULL - it's not strictly valid and some libc's don't let
+ you away with.
+
2007-10-30 Nick Hilliard <nick@inex.ie>
* bgp_main.c: Add 'listenon' argument, to pass address to bind
diff --git a/bgpd/bgp_main.c b/bgpd/bgp_main.c
index 843b124e..fee7f377 100644
--- a/bgpd/bgp_main.c
+++ b/bgpd/bgp_main.c
@@ -321,7 +321,9 @@ main (int argc, char **argv)
/* Print banner. */
zlog_notice ("BGPd %s starting: vty@%d, bgp@%s:%d", QUAGGA_VERSION,
- vty_port, bm->address, bm->port);
+ vty_port,
+ (bm->address ? bm->address : "<all>",
+ bm->port);
/* Start finite state machine, here we go! */
while (thread_fetch (master, &thread))