*: use frr_elevate_privs() (1/2: coccinelle)

[mirror_frr.git] / eigrpd / eigrp_network.c

diff --git a/eigrpd/eigrp_network.c b/eigrpd/eigrp_network.c
index 6b716c1c031c9b3f14145c946110ae192a1c430b..d778578d80af57a73dd78f4a2ac20cba8660bb34 100644 (file)
--- a/eigrpd/eigrp_network.c
+++ b/eigrpd/eigrp_network.c
@@ -62,7 +62,7 @@ int eigrp_sock_init(void)
 #endif
 
        if (eigrpd_privs.change(ZPRIVS_RAISE))
-               zlog_ferr(LIB_ERR_PRIVILEGES,
+               flog_err(LIB_ERR_PRIVILEGES,
                          "eigrp_sock_init: could not raise privs, %s",
                          safe_strerror(errno));
 
@@ -70,10 +70,11 @@ int eigrp_sock_init(void)
        if (eigrp_sock < 0) {
                int save_errno = errno;
                if (eigrpd_privs.change(ZPRIVS_LOWER))
-                       zlog_err("eigrp_sock_init: could not lower privs, %s",
-                                safe_strerror(errno));
-               zlog_ferr(LIB_ERR_SOCKET, "eigrp_read_sock_init: socket: %s",
-                         safe_strerror(save_errno));
+                       flog_err(LIB_ERR_PRIVILEGES,
+                                 "eigrp_sock_init: could not lower privs, %s",
+                                 safe_strerror(errno));
+               flog_err_sys(LIB_ERR_SOCKET, "eigrp_read_sock_init: socket: %s",
+                            safe_strerror(save_errno));
                exit(1);
        }
 
@@ -84,7 +85,7 @@ int eigrp_sock_init(void)
        if (ret < 0) {
                int save_errno = errno;
                if (eigrpd_privs.change(ZPRIVS_LOWER))
-                       zlog_ferr(LIB_ERR_PRIVILEGES,
+                       flog_err(LIB_ERR_PRIVILEGES,
                                  "eigrp_sock_init: could not lower privs, %s",
                                  safe_strerror(errno));
                zlog_warn("Can't set IP_HDRINCL option for fd %d: %s",
@@ -97,7 +98,7 @@ int eigrp_sock_init(void)
        if (ret < 0) {
                int save_errno = errno;
                if (eigrpd_privs.change(ZPRIVS_LOWER))
-                       zlog_ferr(LIB_ERR_PRIVILEGES,
+                       flog_err(LIB_ERR_PRIVILEGES,
                                  "eigrpd_sock_init: could not lower privs, %s",
                                  safe_strerror(errno));
                zlog_warn("can't set sockopt IP_TOS %d to socket %d: %s", tos,
@@ -116,7 +117,7 @@ int eigrp_sock_init(void)
                zlog_warn("Can't set pktinfo option for fd %d", eigrp_sock);
 
        if (eigrpd_privs.change(ZPRIVS_LOWER)) {
-               zlog_ferr(LIB_ERR_PRIVILEGES,
+               flog_err(LIB_ERR_PRIVILEGES,
                          "eigrp_sock_init: could not lower privs, %s",
                          safe_strerror(errno));
        }
@@ -130,9 +131,7 @@ void eigrp_adjust_sndbuflen(struct eigrp *eigrp, unsigned int buflen)
        /* Check if any work has to be done at all. */
        if (eigrp->maxsndbuflen >= buflen)
                return;
-       if (eigrpd_privs.change(ZPRIVS_RAISE))
-               zlog_ferr(LIB_ERR_PRIVILEGES, "%s: could not raise privs, %s",
-                         __func__, safe_strerror(errno));
+       frr_elevate_privs(&eigrpd_privs) {
 
        /* Now we try to set SO_SNDBUF to what our caller has requested
         * (the MTU of a newly added interface). However, if the OS has
@@ -141,18 +140,16 @@ void eigrp_adjust_sndbuflen(struct eigrp *eigrp, unsigned int buflen)
         * may allocate more buffer space, than requested, this isn't
         * a error.
         */
-       setsockopt_so_sendbuf(eigrp->fd, buflen);
-       newbuflen = getsockopt_so_sendbuf(eigrp->fd);
-       if (newbuflen < 0 || newbuflen < (int)buflen)
-               zlog_warn("%s: tried to set SO_SNDBUF to %u, but got %d",
-                         __func__, buflen, newbuflen);
-       if (newbuflen >= 0)
-               eigrp->maxsndbuflen = (unsigned int)newbuflen;
-       else
-               zlog_warn("%s: failed to get SO_SNDBUF", __func__);
-       if (eigrpd_privs.change(ZPRIVS_LOWER))
-               zlog_ferr(LIB_ERR_PRIVILEGES, "%s: could not lower privs, %s",
-                         __func__, safe_strerror(errno));
+               setsockopt_so_sendbuf(eigrp->fd, buflen);
+               newbuflen = getsockopt_so_sendbuf(eigrp->fd);
+               if (newbuflen < 0 || newbuflen < (int)buflen)
+                       zlog_warn("%s: tried to set SO_SNDBUF to %u, but got %d",
+                                 __func__, buflen, newbuflen);
+               if (newbuflen >= 0)
+                       eigrp->maxsndbuflen = (unsigned int)newbuflen;
+               else
+                       zlog_warn("%s: failed to get SO_SNDBUF", __func__);
+       }
 }
 
 int eigrp_if_ipmulticast(struct eigrp *top, struct prefix *p,