diff options
| author | David Lamparter <equinox@opensourcerouting.org> | 2016-11-08 19:02:26 +0100 |
|---|---|---|
| committer | David Lamparter <equinox@opensourcerouting.org> | 2016-11-09 14:29:45 +0100 |
| commit | 1f8df88720e8a93fb1a5b05bda435df1dcd5c96e (patch) | |
| tree | 96759721dbc28e12b84110eb4cf6982f1061b4a1 /vtysh | |
| parent | vtysh: funnel integrated write through watchquagga (diff) | |
| download | frr-1f8df88720e8a93fb1a5b05bda435df1dcd5c96e.tar.xz frr-1f8df88720e8a93fb1a5b05bda435df1dcd5c96e.zip | |
Revert "vtysh: Make vtysh run as quagga user"
This reverts commit 5dd58b08299e85735f19fba1ee307c509fb19de7.
Changing vtysh uid/gid is now actually counterproductive.
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
Diffstat (limited to 'vtysh')
| -rw-r--r-- | vtysh/vtysh_main.c | 24 |
1 files changed, 0 insertions, 24 deletions
diff --git a/vtysh/vtysh_main.c b/vtysh/vtysh_main.c index f2e62ba81..d9c0e3fbf 100644 --- a/vtysh/vtysh_main.c +++ b/vtysh/vtysh_main.c @@ -35,7 +35,6 @@ #include "getopt.h" #include "command.h" #include "memory.h" -#include "privs.h" #include "linklist.h" #include "memory_vty.h" @@ -45,27 +44,6 @@ /* VTY shell program name. */ char *progname; -static zebra_capabilities_t _caps_p [] = -{ - ZCAP_BIND, - ZCAP_NET_RAW, - ZCAP_NET_ADMIN, -}; - -struct zebra_privs_t vtysh_privs = -{ -#if defined(QUAGGA_USER) && defined(QUAGGA_GROUP) - .user = QUAGGA_USER, - .group = QUAGGA_GROUP, -#endif -#ifdef VTY_GROUP - .vty_group = VTY_GROUP, -#endif - .caps_p = _caps_p, - .cap_num_p = array_size(_caps_p), - .cap_num_i = 0, -}; - /* Configuration file name and directory. */ static char vtysh_config_always[] = SYSCONFDIR VTYSH_DEFAULT_CONFIG; static char quagga_config_default[] = SYSCONFDIR QUAGGA_DEFAULT_CONFIG; @@ -378,8 +356,6 @@ main (int argc, char **argv, char **env) line_read = NULL; setlinebuf(stdout); - zprivs_init (&vtysh_privs); - /* Signal and others. */ vtysh_signal_init (); |