diff options
Diffstat (limited to 'zebra/rt_socket.c')
| -rw-r--r-- | zebra/rt_socket.c | 53 |
1 files changed, 5 insertions, 48 deletions
diff --git a/zebra/rt_socket.c b/zebra/rt_socket.c index d603c60d..19b2fc2f 100644 --- a/zebra/rt_socket.c +++ b/zebra/rt_socket.c @@ -27,13 +27,10 @@ #include "sockunion.h" #include "log.h" #include "str.h" -#include "privs.h" #include "zebra/debug.h" #include "zebra/rib.h" -extern struct zebra_privs_t zserv_privs; - int rtm_write (int message, union sockunion *dest, @@ -190,29 +187,13 @@ kernel_rtm_ipv4 (int cmd, struct prefix *p, struct rib *rib, int family) int kernel_add_ipv4 (struct prefix *p, struct rib *rib) { - int route; - - if (zserv_privs.change(ZPRIVS_RAISE)) - zlog (NULL, LOG_ERR, "Can't raise privileges"); - route = kernel_rtm_ipv4 (RTM_ADD, p, rib, AF_INET); - if (zserv_privs.change(ZPRIVS_LOWER)) - zlog (NULL, LOG_ERR, "Can't lower privileges"); - - return route; + return kernel_rtm_ipv4 (RTM_ADD, p, rib, AF_INET); } int kernel_delete_ipv4 (struct prefix *p, struct rib *rib) { - int route; - - if (zserv_privs.change(ZPRIVS_RAISE)) - zlog (NULL, LOG_ERR, "Can't raise privileges"); - route = kernel_rtm_ipv4 (RTM_DELETE, p, rib, AF_INET); - if (zserv_privs.change(ZPRIVS_LOWER)) - zlog (NULL, LOG_ERR, "Can't lower privileges"); - - return route; + return kernel_rtm_ipv4 (RTM_DELETE, p, rib, AF_INET); } #ifdef HAVE_IPV6 @@ -440,29 +421,13 @@ kernel_rtm_ipv6_multipath (int cmd, struct prefix *p, struct rib *rib, int kernel_add_ipv6 (struct prefix *p, struct rib *rib) { - int route; - - if (zserv_privs.change(ZPRIVS_RAISE)) - zlog (NULL, LOG_ERR, "Can't raise privileges"); - route = kernel_rtm_ipv6_multipath (RTM_ADD, p, rib, AF_INET6); - if (zserv_privs.change(ZPRIVS_LOWER)) - zlog (NULL, LOG_ERR, "Can't lower privileges"); - - return route; + return kernel_rtm_ipv6_multipath (RTM_ADD, p, rib, AF_INET6); } int kernel_delete_ipv6 (struct prefix *p, struct rib *rib) { - int route; - - if (zserv_privs.change(ZPRIVS_RAISE)) - zlog (NULL, LOG_ERR, "Can't raise privileges"); - route = kernel_rtm_ipv6_multipath (RTM_DELETE, p, rib, AF_INET6); - if (zserv_privs.change(ZPRIVS_LOWER)) - zlog (NULL, LOG_ERR, "Can't lower privileges"); - - return route; + return kernel_rtm_ipv6_multipath (RTM_DELETE, p, rib, AF_INET6); } /* Delete IPv6 route from the kernel. */ @@ -470,14 +435,6 @@ int kernel_delete_ipv6_old (struct prefix_ipv6 *dest, struct in6_addr *gate, int index, int flags, int table) { - int route; - - if (zserv_privs.change(ZPRIVS_RAISE)) - zlog (NULL, LOG_ERR, "Can't raise privileges"); - route = kernel_rtm_ipv6 (RTM_DELETE, dest, gate, index, flags); - if (zserv_privs.change(ZPRIVS_LOWER)) - zlog (NULL, LOG_ERR, "Can't lower privileges"); - - return route; + return kernel_rtm_ipv6 (RTM_DELETE, dest, gate, index, flags); } #endif /* HAVE_IPV6 */ |