From: Cédric Bosdonnat <cbosdonnat@suse.com>
Date: Fri, 3 Mar 2017 13:13:49 +0000 (+0100)
Subject: bridge_driver.c: more uses of SYSCTL_PATH
X-Git-Tag: v3.2.0-rc1~194
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3ee35d7d6caf0ffa722d60251eabec43c094fb12;p=thirdparty%2Flibvirt.git

bridge_driver.c: more uses of SYSCTL_PATH

Replace a few occurences of /proc/sys by the corresponding macro
defined a few lines after: SYSCTL_PATH
---

diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c
index 32c5ab7a71..4d1a44516b 100644
--- a/src/network/bridge_driver.c
+++ b/src/network/bridge_driver.c
@@ -85,6 +85,8 @@
  */
 #define VIR_NETWORK_DHCP_LEASE_FILE_SIZE_MAX (32 * 1024 * 1024)
 
+#define SYSCTL_PATH "/proc/sys"
+
 VIR_LOG_INIT("network.bridge_driver");
 
 static virNetworkDriverStatePtr network_driver;
@@ -2092,15 +2094,14 @@ networkEnableIPForwarding(bool enableIPv4, bool enableIPv6)
                            &enabled, sizeof(enabled));
 #else
     if (enableIPv4)
-        ret = virFileWriteStr("/proc/sys/net/ipv4/ip_forward", "1\n", 0);
+        ret = virFileWriteStr(SYSCTL_PATH "/net/ipv4/ip_forward", "1\n", 0);
     if (enableIPv6 && ret == 0)
-        ret = virFileWriteStr("/proc/sys/net/ipv6/conf/all/forwarding", "1\n", 0);
+        ret = virFileWriteStr(SYSCTL_PATH "/net/ipv6/conf/all/forwarding", "1\n", 0);
+
 #endif
     return ret;
 }
 
-#define SYSCTL_PATH "/proc/sys"
-
 static int
 networkSetIPv6Sysctls(virNetworkObjPtr network)
 {