Make group to run daemon as configurable. Fixes #2 from Bugzilla #64.
diff --git a/zebra/ChangeLog b/zebra/ChangeLog
index c4e32b8..7193231 100644
--- a/zebra/ChangeLog
+++ b/zebra/ChangeLog
@@ -2,6 +2,7 @@
* irdp_interface.c: Remove comment from DEFUN, it breaks vtysh because
it confuses extract.pl.
+ * main.c: Make group to run as configurable.
2004-10-28 Hasso Tepper <hasso at quagga.net>
diff --git a/zebra/main.c b/zebra/main.c
index 72e2c58..42e6bd1 100644
--- a/zebra/main.c
+++ b/zebra/main.c
@@ -79,6 +79,7 @@
{ "nl-bufsize", no_argument, NULL, 's'},
#endif /* HAVE_NETLINK */
{ "user", required_argument, NULL, 'u'},
+ { "group", required_argument, NULL, 'g'},
{ "version", no_argument, NULL, 'v'},
{ 0 }
};
@@ -133,7 +134,8 @@
"-P, --vty_port Set vty's port number\n"\
"-r, --retain When program terminates, retain added route "\
"by zebra.\n"\
- "-u, --user User and group to run as\n", progname);
+ "-u, --user User to run as\n"\
+ "-g, --group Group to run as\n", progname);
#ifdef HAVE_NETLINK
printf ("-s, --nl-bufsize Set netlink receive buffer size\n");
#endif /* HAVE_NETLINK */
@@ -230,9 +232,9 @@
int opt;
#ifdef HAVE_NETLINK
- opt = getopt_long (argc, argv, "bdklf:i:hA:P:ru:vs:", longopts, 0);
+ opt = getopt_long (argc, argv, "bdklf:i:hA:P:ru:g:vs:", longopts, 0);
#else
- opt = getopt_long (argc, argv, "bdklf:i:hA:P:ru:v", longopts, 0);
+ opt = getopt_long (argc, argv, "bdklf:i:hA:P:ru:g:v", longopts, 0);
#endif /* HAVE_NETLINK */
if (opt == EOF)
@@ -281,9 +283,12 @@
nl_rcvbufsize = atoi (optarg);
break;
#endif /* HAVE_NETLINK */
- case 'u':
- zserv_privs.user = zserv_privs.group = optarg;
- break;
+ case 'u':
+ zserv_privs.user = optarg;
+ break;
+ case 'g':
+ zserv_privs.group = optarg;
+ break;
case 'v':
print_version (progname);
exit (0);