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>

diff --git a/vtysh/vtysh_main.c b/vtysh/vtysh_main.c
index f2e62ba81504fb91d0fcba415ef605fa97fe3458..d9c0e3fbfda21cb8518f5f45bf1be948c9134852 100644 (file)
--- 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 ();