zebra, lib: fix the ZEBRA_INTERFACE_VRF_UPDATE zapi message

[mirror_frr.git] / zebra / ipforward_proc.c

diff --git a/zebra/ipforward_proc.c b/zebra/ipforward_proc.c
index fc276244107fd36fb6a92abd12977782ef312806..8f44c377b33ecf873be3453ea95e808816f0f499 100644 (file)
--- a/zebra/ipforward_proc.c
+++ b/zebra/ipforward_proc.c
@@ -25,7 +25,6 @@
 
 #include "log.h"
 #include "privs.h"
-#include "lib_errors.h"
 
 #include "zebra/ipforward.h"
 
@@ -77,27 +76,19 @@ int ipforward_on(void)
 {
        FILE *fp;
 
-       if (zserv_privs.change(ZPRIVS_RAISE))
-               flog_err(LIB_ERR_PRIVILEGES, "Can't raise privileges, %s",
-                         safe_strerror(errno));
+       frr_elevate_privs(&zserv_privs) {
 
-       fp = fopen(proc_ipv4_forwarding, "w");
+               fp = fopen(proc_ipv4_forwarding, "w");
 
-       if (fp == NULL) {
-               if (zserv_privs.change(ZPRIVS_LOWER))
-                       flog_err(LIB_ERR_PRIVILEGES,
-                                 "Can't lower privileges, %s",
-                                 safe_strerror(errno));
-               return -1;
-       }
+               if (fp == NULL) {
+                       return -1;
+               }
 
-       fprintf(fp, "1\n");
+               fprintf(fp, "1\n");
 
-       fclose(fp);
+               fclose(fp);
 
-       if (zserv_privs.change(ZPRIVS_LOWER))
-               flog_err(LIB_ERR_PRIVILEGES, "Can't lower privileges, %s",
-                         safe_strerror(errno));
+       }
 
        return ipforward();
 }
@@ -106,27 +97,19 @@ int ipforward_off(void)
 {
        FILE *fp;
 
-       if (zserv_privs.change(ZPRIVS_RAISE))
-               flog_err(LIB_ERR_PRIVILEGES, "Can't raise privileges, %s",
-                         safe_strerror(errno));
+       frr_elevate_privs(&zserv_privs) {
 
-       fp = fopen(proc_ipv4_forwarding, "w");
+               fp = fopen(proc_ipv4_forwarding, "w");
 
-       if (fp == NULL) {
-               if (zserv_privs.change(ZPRIVS_LOWER))
-                       flog_err(LIB_ERR_PRIVILEGES,
-                                 "Can't lower privileges, %s",
-                                 safe_strerror(errno));
-               return -1;
-       }
+               if (fp == NULL) {
+                       return -1;
+               }
 
-       fprintf(fp, "0\n");
+               fprintf(fp, "0\n");
 
-       fclose(fp);
+               fclose(fp);
 
-       if (zserv_privs.change(ZPRIVS_LOWER))
-               flog_err(LIB_ERR_PRIVILEGES, "Can't lower privileges, %s",
-                         safe_strerror(errno));
+       }
 
        return ipforward();
 }
@@ -160,27 +143,19 @@ int ipforward_ipv6_on(void)
 {
        FILE *fp;
 
-       if (zserv_privs.change(ZPRIVS_RAISE))
-               flog_err(LIB_ERR_PRIVILEGES, "Can't raise privileges, %s",
-                         safe_strerror(errno));
+       frr_elevate_privs(&zserv_privs) {
 
-       fp = fopen(proc_ipv6_forwarding, "w");
+               fp = fopen(proc_ipv6_forwarding, "w");
 
-       if (fp == NULL) {
-               if (zserv_privs.change(ZPRIVS_LOWER))
-                       flog_err(LIB_ERR_PRIVILEGES,
-                                 "Can't lower privileges, %s",
-                                 safe_strerror(errno));
-               return -1;
-       }
+               if (fp == NULL) {
+                       return -1;
+               }
 
-       fprintf(fp, "1\n");
+               fprintf(fp, "1\n");
 
-       fclose(fp);
+               fclose(fp);
 
-       if (zserv_privs.change(ZPRIVS_LOWER))
-               flog_err(LIB_ERR_PRIVILEGES, "Can't lower privileges, %s",
-                         safe_strerror(errno));
+       }
 
        return ipforward_ipv6();
 }
@@ -190,27 +165,19 @@ int ipforward_ipv6_off(void)
 {
        FILE *fp;
 
-       if (zserv_privs.change(ZPRIVS_RAISE))
-               flog_err(LIB_ERR_PRIVILEGES, "Can't raise privileges, %s",
-                         safe_strerror(errno));
+       frr_elevate_privs(&zserv_privs) {
 
-       fp = fopen(proc_ipv6_forwarding, "w");
+               fp = fopen(proc_ipv6_forwarding, "w");
 
-       if (fp == NULL) {
-               if (zserv_privs.change(ZPRIVS_LOWER))
-                       flog_err(LIB_ERR_PRIVILEGES,
-                                 "Can't lower privileges, %s",
-                                 safe_strerror(errno));
-               return -1;
-       }
+               if (fp == NULL) {
+                       return -1;
+               }
 
-       fprintf(fp, "0\n");
+               fprintf(fp, "0\n");
 
-       fclose(fp);
+               fclose(fp);
 
-       if (zserv_privs.change(ZPRIVS_LOWER))
-               flog_err(LIB_ERR_PRIVILEGES, "Can't lower privileges, %s",
-                         safe_strerror(errno));
+       }
 
        return ipforward_ipv6();
 }