diff options
Diffstat (limited to 'zebra/main.c')
| -rw-r--r-- | zebra/main.c | 35 |
1 files changed, 3 insertions, 32 deletions
diff --git a/zebra/main.c b/zebra/main.c index 72b1fc4e..66469a2f 100644 --- a/zebra/main.c +++ b/zebra/main.c @@ -1,4 +1,5 @@ -/* zebra daemon main routine. +/* + * zebra daemon main routine. * Copyright (C) 1997, 98 Kunihiro Ishiguro * * This file is part of GNU Zebra. @@ -29,7 +30,6 @@ #include "memory.h" #include "prefix.h" #include "log.h" -#include "privs.h" #include "zebra/rib.h" #include "zebra/zserv.h" @@ -62,32 +62,10 @@ struct option longopts[] = { "vty_addr", required_argument, NULL, 'A'}, { "vty_port", required_argument, NULL, 'P'}, { "retain", no_argument, NULL, 'r'}, - { "user", required_argument, NULL, 'u'}, { "version", no_argument, NULL, 'v'}, { 0 } }; -zebra_capabilities_t _caps_p [] = -{ - ZCAP_ADMIN, - ZCAP_SYS_ADMIN, -}; - -/* zebra privileges to run with */ -struct zebra_privs_t zserv_privs = -{ -#if defined(ZEBRA_USER) && defined(ZEBRA_GROUP) - .user = ZEBRA_USER, - .group = ZEBRA_GROUP, -#endif -#ifdef VTY_GROUP - .vty_group = VTY_GROUP, -#endif - .caps_p = _caps_p, - .cap_num_p = sizeof(_caps_p)/sizeof(_caps_p[0]), - .cap_num_i = 0 -}; - /* Default configuration file path. */ char config_current[] = DEFAULT_CONFIG_FILE; char config_default[] = SYSCONFDIR DEFAULT_CONFIG_FILE; @@ -115,7 +93,6 @@ redistribution between different routing protocols.\n\n\ -A, --vty_addr Set vty's bind address\n\ -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\ -v, --version Print program version\n\ -h, --help Display this help and exit\n\ \n\ @@ -219,7 +196,7 @@ main (int argc, char **argv) { int opt; - opt = getopt_long (argc, argv, "bdklf:hA:P:ru:v", longopts, 0); + opt = getopt_long (argc, argv, "bdklf:hA:P:rv", longopts, 0); if (opt == EOF) break; @@ -262,9 +239,6 @@ main (int argc, char **argv) case 'r': retain_mode = 1; break; - case 'u': - zserv_privs.user = zserv_privs.group = optarg; - break; case 'v': print_version (progname); exit (0); @@ -281,9 +255,6 @@ main (int argc, char **argv) /* Make master thread emulator. */ master = thread_master_create (); - /* privs initialise */ - zprivs_init (&zserv_privs); - /* Vty related initialize. */ signal_init (); cmd_init (1); |