From: Craig Small <csmall@enc.com.au>
Date: Fri, 27 Dec 2013 12:08:14 +0000 (+1100)
Subject: sysctl --system loads default config file
X-Git-Tag: v3.3.10~123
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7f6efed9bb85d1e212e06985ea3e06720f6ca949;p=procps-ng

sysctl --system loads default config file

Commit cdca71e94506fbb921ab2c626be3ad05c4287498 fixed
the loading the sysctl.conf file, but had the logic
for checking the file exists reversed incorrectly.
---

diff --git a/NEWS b/NEWS
index 287f8671..1c710a3b 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,7 @@
+procps-ng-3.3.10
+----------------
+  * sysctl --system loads default config file - Debian #732920
+
 procps-ng-3.3.9
 ---------------
   * kernel namespaces support added to skill, pgrep, ps and top
diff --git a/sysctl.c b/sysctl.c
index bb3e6b73..33c94035 100644
--- a/sysctl.c
+++ b/sysctl.c
@@ -640,7 +640,7 @@ static int PreloadSystem(void)
 	}
 
 
-	if (stat(DEFAULT_PRELOAD, &ts) < 0 && S_ISREG(ts.st_mode)) {
+	if (stat(DEFAULT_PRELOAD, &ts) < 0 || S_ISREG(ts.st_mode)) {
 		if (!Quiet)
 			printf(_("* Applying %s ...\n"), DEFAULT_PRELOAD);
 		rc |= Preload(DEFAULT_PRELOAD);