From: hasso <hasso>
Date: Fri, 6 Aug 2004 08:41:56 +0000 (+0000)
Subject: Remove pointless privilege lower call. Thanks to Cougar for noticing.
X-Git-Tag: frr-2.0-rc1~3634
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=55e7ecd114cd4f29b529f00cc1fe5d02d0f5b34f;p=mirror%2Ffrr.git

Remove pointless privilege lower call. Thanks to Cougar for noticing.
---

diff --git a/zebra/rt_netlink.c b/zebra/rt_netlink.c
index 26369dd85f..2ca0de43f3 100644
--- a/zebra/rt_netlink.c
+++ b/zebra/rt_netlink.c
@@ -122,19 +122,17 @@ netlink_socket (struct nlsock *nl, unsigned long groups)
     }
 
   ret = bind (sock, (struct sockaddr *) &snl, sizeof snl);
+  if (zserv_privs.change (ZPRIVS_LOWER))
+    zlog (NULL, LOG_ERR, "Can't lower privileges");
+
   if (ret < 0)
     {
-      if (zserv_privs.change (ZPRIVS_LOWER))
-        zlog (NULL, LOG_ERR, "Can't lower privileges");
       zlog (NULL, LOG_ERR, "Can't bind %s socket to group 0x%x: %s",
             nl->name, snl.nl_groups, strerror (errno));
       close (sock);
       return -1;
     }
 
-  if (zserv_privs.change (ZPRIVS_LOWER))
-    zlog (NULL, LOG_ERR, "Can't lower privileges");
-
   /* multiple netlink sockets will have different nl_pid */
   namelen = sizeof snl;
   ret = getsockname (sock, (struct sockaddr *) &snl, &namelen);