summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Hall <chris.hall@highwayman.com>2010-12-21 12:15:26 +0000
committerChris Hall <chris.hall@highwayman.com>2010-12-21 12:15:26 +0000
commit8443ca08672e0cf5b779f59db9d556dadf763de7 (patch)
tree0466ec0ec4f761d862e08feb827e6c0804728de4
parent121f2f888e02a28e7896f84dde019cb320f0b11d (diff)
parent5cffb8de373bbd19c9db36239cf41951e266953e (diff)
downloadquagga-8443ca08672e0cf5b779f59db9d556dadf763de7.tar.bz2
quagga-8443ca08672e0cf5b779f59db9d556dadf763de7.tar.xz
Merge branch 'master' into pipework -- sync with ex09
-rw-r--r--bgpd/bgp_vty.c9
-rwxr-xr-xconfigure.ac2
2 files changed, 6 insertions, 5 deletions
diff --git a/bgpd/bgp_vty.c b/bgpd/bgp_vty.c
index b8af6140..23d39b85 100644
--- a/bgpd/bgp_vty.c
+++ b/bgpd/bgp_vty.c
@@ -10379,8 +10379,8 @@ DEFUN (show_ip_community_list,
{
list = symbol_get_value(sym) ;
if (list != NULL)
- community_list_show (vty, list) ;
- }
+ community_list_show (vty, list);
+ } ;
vector_free(extract) ; /* discard temporary vector */
@@ -10726,6 +10726,7 @@ DEFUN (show_ip_extcommunity_list,
vector extract ;
vector_index_t i ;
struct symbol* sym ;
+ struct community_list *list;
table = community_list_master_lookup (bgp_clist, EXTCOMMUNITY_LIST_MASTER);
if (table == NULL)
@@ -10737,8 +10738,8 @@ DEFUN (show_ip_extcommunity_list,
{
list = symbol_get_value(sym) ;
if (list != NULL)
- extcommunity_list_show (vty, list) ;
- }
+ extcommunity_list_show (vty, list);
+ } ;
vector_free(extract) ; /* discard temporary vector */
diff --git a/configure.ac b/configure.ac
index e3c97768..61afe05d 100755
--- a/configure.ac
+++ b/configure.ac
@@ -8,7 +8,7 @@
## $Id$
AC_PREREQ(2.53)
-AC_INIT(Quagga, 0.99.15ex08, [http://bugzilla.quagga.net])
+AC_INIT(Quagga, 0.99.15ex09, [http://bugzilla.quagga.net])
AC_CONFIG_SRCDIR(lib/zebra.h)
AC_CONFIG_MACRO_DIR([m4])