Merge pull request #5793 from ton31337/fix/formatting_show_bgp_summary_failed

[mirror_frr.git] / zebra / ipforward_proc.c

diff --git a/zebra/ipforward_proc.c b/zebra/ipforward_proc.c
index 8f44c377b33ecf873be3453ea95e808816f0f499..226f722937f08662bf75818acd49473fddbe2c71 100644 (file)
--- a/zebra/ipforward_proc.c
+++ b/zebra/ipforward_proc.c
@@ -30,7 +30,7 @@
 
 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)
 {
@@ -70,13 +70,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");
 
@@ -97,7 +97,7 @@ int ipforward_off(void)
 {
        FILE *fp;
 
-       frr_elevate_privs(&zserv_privs) {
+       frr_with_privs(&zserv_privs) {
 
                fp = fopen(proc_ipv4_forwarding, "w");
 
@@ -114,7 +114,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)
 {
@@ -143,7 +144,7 @@ int ipforward_ipv6_on(void)
 {
        FILE *fp;
 
-       frr_elevate_privs(&zserv_privs) {
+       frr_with_privs(&zserv_privs) {
 
                fp = fopen(proc_ipv6_forwarding, "w");
 
@@ -165,7 +166,7 @@ int ipforward_ipv6_off(void)
 {
        FILE *fp;
 
-       frr_elevate_privs(&zserv_privs) {
+       frr_with_privs(&zserv_privs) {
 
                fp = fopen(proc_ipv6_forwarding, "w");