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 2834eeeb9cc51f62921c9f95796f21030a56b481..8f44c377b33ecf873be3453ea95e808816f0f499 100644 (file)
--- a/zebra/ipforward_proc.c
+++ b/zebra/ipforward_proc.c
@@ -42,6 +42,7 @@ static void dropline(FILE *fp)
 
 int ipforward(void)
 {
+       int ret = 0;
        FILE *fp;
        int ipforwarding = 0;
        char buf[10];
@@ -58,11 +59,11 @@ int ipforward(void)
           1 => ip forwarding enabled
           2 => ip forwarding off. */
        if (fgets(buf, 6, fp))
-               sscanf(buf, "Ip: %d", &ipforwarding);
+               ret = sscanf(buf, "Ip: %d", &ipforwarding);
 
        fclose(fp);
 
-       if (ipforwarding == 1)
+       if (ret == 1 && ipforwarding == 1)
                return 1;
 
        return 0;
@@ -75,24 +76,19 @@ int ipforward_on(void)
 {
        FILE *fp;
 
-       if (zserv_privs.change(ZPRIVS_RAISE))
-               zlog_err("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))
-                       zlog_err("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))
-               zlog_err("Can't lower privileges, %s", safe_strerror(errno));
+       }
 
        return ipforward();
 }
@@ -101,24 +97,19 @@ int ipforward_off(void)
 {
        FILE *fp;
 
-       if (zserv_privs.change(ZPRIVS_RAISE))
-               zlog_err("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))
-                       zlog_err("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))
-               zlog_err("Can't lower privileges, %s", safe_strerror(errno));
+       }
 
        return ipforward();
 }
@@ -127,6 +118,7 @@ char proc_ipv6_forwarding[] = "/proc/sys/net/ipv6/conf/all/forwarding";
 
 int ipforward_ipv6(void)
 {
+       int ret = 0;
        FILE *fp;
        char buf[5];
        int ipforwarding = 0;
@@ -137,9 +129,13 @@ int ipforward_ipv6(void)
                return -1;
 
        if (fgets(buf, 2, fp))
-               sscanf(buf, "%d", &ipforwarding);
+               ret = sscanf(buf, "%d", &ipforwarding);
 
        fclose(fp);
+
+       if (ret != 1)
+               return 0;
+
        return ipforwarding;
 }
 
@@ -147,24 +143,19 @@ int ipforward_ipv6_on(void)
 {
        FILE *fp;
 
-       if (zserv_privs.change(ZPRIVS_RAISE))
-               zlog_err("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))
-                       zlog_err("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))
-               zlog_err("Can't lower privileges, %s", safe_strerror(errno));
+       }
 
        return ipforward_ipv6();
 }
@@ -174,24 +165,19 @@ int ipforward_ipv6_off(void)
 {
        FILE *fp;
 
-       if (zserv_privs.change(ZPRIVS_RAISE))
-               zlog_err("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))
-                       zlog_err("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))
-               zlog_err("Can't lower privileges, %s", safe_strerror(errno));
+       }
 
        return ipforward_ipv6();
 }