Merge branch 'quagga' into google-bgp-multipath

Conflicts:
	bgpd/bgp_route.c

1 files changed, 16 insertions, 10 deletions

diff --git a/isisd/isis_main.c b/isisd/isis_main.c
index c5e824c1..15d85d6d 100644
--- a/isisd/isis_main.c
+++ b/isisd/isis_main.c
@@ -34,6 +34,7 @@
 #include "privs.h"
 #include "sigevent.h"
 #include "filter.h"
+#include "zclient.h"
 
 #include "isisd/dict.h"
 #include "include-netbsd/iso.h"
@@ -72,16 +73,17 @@ struct zebra_privs_t isisd_privs = {
 
 /* isisd options */
 struct option longopts[] = {
-  {"daemon", no_argument, NULL, 'd'},
+  {"daemon",      no_argument,       NULL, 'd'},
   {"config_file", required_argument, NULL, 'f'},
-  {"pid_file", required_argument, NULL, 'i'},
-  {"vty_addr", required_argument, NULL, 'A'},
-  {"vty_port", required_argument, NULL, 'P'},
-  {"user", required_argument, NULL, 'u'},
-  {"group", required_argument, NULL, 'g'},
-  {"version", no_argument, NULL, 'v'},
-  {"dryrun", no_argument, NULL, 'C'},
-  {"help", no_argument, NULL, 'h'},
+  {"pid_file",    required_argument, NULL, 'i'},
+  {"socket",      required_argument, NULL, 'z'},
+  {"vty_addr",    required_argument, NULL, 'A'},
+  {"vty_port",    required_argument, NULL, 'P'},
+  {"user",        required_argument, NULL, 'u'},
+  {"group",       required_argument, NULL, 'g'},
+  {"version",     no_argument,       NULL, 'v'},
+  {"dryrun",      no_argument,       NULL, 'C'},
+  {"help",        no_argument,       NULL, 'h'},
   {0}
 };
 
@@ -130,6 +132,7 @@ Daemon which manages IS-IS routing\n\n\
 -d, --daemon       Runs in daemon mode\n\
 -f, --config_file  Set configuration file name\n\
 -i, --pid_file     Set process identifier file name\n\
+-z, --socket       Set path of zebra socket\n\
 -A, --vty_addr     Set vty's bind address\n\
 -P, --vty_port     Set vty's port number\n\
 -u, --user         User to run as\n\
@@ -246,7 +249,7 @@ main (int argc, char **argv, char **envp)
   /* Command line argument treatment. */
   while (1)
     {
-      opt = getopt_long (argc, argv, "df:i:hA:p:P:u:g:vC", longopts, 0);
+      opt = getopt_long (argc, argv, "df:i:z:hA:p:P:u:g:vC", longopts, 0);
 
       if (opt == EOF)
 	break;
@@ -264,6 +267,9 @@ main (int argc, char **argv, char **envp)
 	case 'i':
 	  pid_file = optarg;
 	  break;
+	case 'z':
+	  zclient_serv_path_set (optarg);
+	  break;
 	case 'A':
 	  vty_addr = optarg;
 	  break;