diff options
Diffstat (limited to 'ospfd/ospf_network.c')
| -rw-r--r-- | ospfd/ospf_network.c | 43 |
1 files changed, 3 insertions, 40 deletions
diff --git a/ospfd/ospf_network.c b/ospfd/ospf_network.c index 87aec1e5..56ec8647 100644 --- a/ospfd/ospf_network.c +++ b/ospfd/ospf_network.c @@ -29,9 +29,6 @@ #include "sockunion.h" #include "log.h" #include "sockopt.h" -#include "privs.h" - -extern struct zebra_privs_t ospfd_privs; #include "ospfd/ospfd.h" #include "ospfd/ospf_network.h" @@ -42,8 +39,6 @@ extern struct zebra_privs_t ospfd_privs; #include "ospfd/ospf_neighbor.h" #include "ospfd/ospf_packet.h" - - /* Join to the OSPF ALL SPF ROUTERS multicast group. */ int ospf_if_add_allspfrouters (struct ospf *top, struct prefix *p, @@ -156,20 +151,12 @@ ospf_sock_init (void) int ospf_sock; int ret, tos, hincl = 1; - if ( ospfd_privs.change (ZPRIVS_RAISE) ) - zlog_err ("ospf_sock_init: could not raise privs, %s", - strerror (errno) ); - ospf_sock = socket (AF_INET, SOCK_RAW, IPPROTO_OSPFIGP); if (ospf_sock < 0) { - if ( ospfd_privs.change (ZPRIVS_LOWER) ) - zlog_err ("ospf_sock_init: could not lower privs, %s", - strerror (errno) ); zlog_warn ("ospf_read_sock_init: socket: %s", strerror (errno)); return -1; } - /* Set precedence field. */ #ifdef IPTOS_PREC_INTERNETCONTROL @@ -178,9 +165,6 @@ ospf_sock_init (void) (char *) &tos, sizeof (int)); if (ret < 0) { - if ( ospfd_privs.change (ZPRIVS_LOWER) ) - zlog_err ("ospf_sock_init: could not lower privs, %s", - strerror (errno) ); zlog_warn ("can't set sockopt IP_TOS %d to socket %d", tos, ospf_sock); close (ospf_sock); /* Prevent sd leak. */ return ret; @@ -190,40 +174,19 @@ ospf_sock_init (void) /* we will include IP header with packet */ ret = setsockopt (ospf_sock, IPPROTO_IP, IP_HDRINCL, &hincl, sizeof (hincl)); if (ret < 0) - { - if ( ospfd_privs.change (ZPRIVS_LOWER) ) - zlog_err ("ospf_sock_init: could not lower privs, %s", - strerror (errno) ); - zlog_warn ("Can't set IP_HDRINCL option"); - } + zlog_warn ("Can't set IP_HDRINCL option"); #if defined (IP_PKTINFO) ret = setsockopt (ospf_sock, IPPROTO_IP, IP_PKTINFO, &hincl, sizeof (hincl)); if (ret < 0) - { - if ( ospfd_privs.change (ZPRIVS_LOWER) ) - zlog_err ("ospf_sock_init: could not lower privs, %s", - strerror (errno) ); - zlog_warn ("Can't set IP_PKTINFO option"); - } + zlog_warn ("Can't set IP_PKTINFO option"); #elif defined (IP_RECVIF) ret = setsockopt (ospf_sock, IPPROTO_IP, IP_RECVIF, &hincl, sizeof (hincl)); if (ret < 0) - { - if ( ospfd_privs.change (ZPRIVS_LOWER) ) - zlog_err ("ospf_sock_init: could not lower privs, %s", - strerror (errno) ); - zlog_warn ("Can't set IP_RECVIF option"); - } + zlog_warn ("Can't set IP_RECVIF option"); #else #warning "cannot be able to receive link information on this OS" #endif - - if (ospfd_privs.change (ZPRIVS_LOWER)) - { - zlog_err ("ospf_sock_init: could not lower privs, %s", - strerror (errno) ); - } return ospf_sock; } |