Merge pull request #8643 from icosahedral/master

[mirror_frr.git] / zebra / ipforward_proc.c

diff --git a/zebra/ipforward_proc.c b/zebra/ipforward_proc.c
index 3a766b1ea98cc114ef33fd80e259d7acf630dc33..4bd160ddbca6e741b0c3ff8e40a457c254d02fa8 100644 (file)
--- a/zebra/ipforward_proc.c
+++ b/zebra/ipforward_proc.c
@@ -25,19 +25,16 @@
 
 #include "log.h"
 #include "privs.h"
-#include "lib_errors.h"
 
 #include "zebra/ipforward.h"
 
 extern struct zebra_privs_t zserv_privs;
 
-char proc_net_snmp[] = "/proc/net/snmp";
+static const char proc_net_snmp[] = "/proc/net/snmp";
 
 static void dropline(FILE *fp)
 {
-       int c;
-
-       while ((c = getc(fp)) != '\n')
+       while (getc(fp) != '\n')
                ;
 }
 
@@ -71,13 +68,13 @@ int ipforward(void)
 }
 
 /* char proc_ipv4_forwarding[] = "/proc/sys/net/ipv4/conf/all/forwarding"; */
-char proc_ipv4_forwarding[] = "/proc/sys/net/ipv4/ip_forward";
+static const char proc_ipv4_forwarding[] = "/proc/sys/net/ipv4/ip_forward";
 
 int ipforward_on(void)
 {
        FILE *fp;
 
-       frr_elevate_privs(&zserv_privs) {
+       frr_with_privs(&zserv_privs) {
 
                fp = fopen(proc_ipv4_forwarding, "w");
 
@@ -98,7 +95,7 @@ int ipforward_off(void)
 {
        FILE *fp;
 
-       frr_elevate_privs(&zserv_privs) {
+       frr_with_privs(&zserv_privs) {
 
                fp = fopen(proc_ipv4_forwarding, "w");
 
@@ -115,7 +112,8 @@ int ipforward_off(void)
        return ipforward();
 }
 
-char proc_ipv6_forwarding[] = "/proc/sys/net/ipv6/conf/all/forwarding";
+static const char proc_ipv6_forwarding[] =
+       "/proc/sys/net/ipv6/conf/all/forwarding";
 
 int ipforward_ipv6(void)
 {
@@ -144,7 +142,7 @@ int ipforward_ipv6_on(void)
 {
        FILE *fp;
 
-       frr_elevate_privs(&zserv_privs) {
+       frr_with_privs(&zserv_privs) {
 
                fp = fopen(proc_ipv6_forwarding, "w");
 
@@ -166,7 +164,7 @@ int ipforward_ipv6_off(void)
 {
        FILE *fp;
 
-       frr_elevate_privs(&zserv_privs) {
+       frr_with_privs(&zserv_privs) {
 
                fp = fopen(proc_ipv6_forwarding, "w");