|
 |
aea863 |
autofs-5.1.4 - tiny patch for autofs typo and possible bug
|
|
|
aea863 |
|
|
|
aea863 |
From: Todd Eigenschink <todd@fai2.com>
|
|
|
aea863 |
|
|
|
aea863 |
(1) The word "to" is doubled in two warnings.
|
|
|
aea863 |
|
|
|
aea863 |
(2) It prints a warning when it can't open the "old" config file, even
|
|
|
aea863 |
if it was able to open the default one. That's a reasonable warning if
|
|
|
aea863 |
it *couldn't* open the new one, but seems unnecessary if it could.
|
|
|
aea863 |
|
|
|
aea863 |
The patch removes the unneeded "to"s and only prints warning about the
|
|
|
aea863 |
old config file if it couldn't open the default one.
|
|
|
aea863 |
|
|
|
aea863 |
Signed-off-by: Todd Eigenschink <todd@fai2.com>
|
|
|
aea863 |
Signed-off-by: Ian Kent <raven@themaw.net>
|
|
|
aea863 |
---
|
|
|
aea863 |
CHANGELOG | 1 +
|
|
|
aea863 |
lib/defaults.c | 6 +++---
|
|
|
aea863 |
2 files changed, 4 insertions(+), 3 deletions(-)
|
|
|
aea863 |
|
|
|
aea863 |
--- autofs-5.1.4.orig/CHANGELOG
|
|
|
aea863 |
+++ autofs-5.1.4/CHANGELOG
|
|
|
aea863 |
@@ -20,6 +20,7 @@ xx/xx/2018 autofs-5.1.5
|
|
|
aea863 |
- add conditional inclusion of fedfs binaries.
|
|
|
aea863 |
- add an example fedfs master map entry to the installed master map.
|
|
|
aea863 |
- improve hostname lookup error logging.
|
|
|
aea863 |
+- tiny patch for autofs typo and possible bug.
|
|
|
aea863 |
|
|
|
aea863 |
19/12/2017 autofs-5.1.4
|
|
|
aea863 |
- fix spec file url.
|
|
|
aea863 |
--- autofs-5.1.4.orig/lib/defaults.c
|
|
|
aea863 |
+++ autofs-5.1.4/lib/defaults.c
|
|
|
aea863 |
@@ -1207,12 +1207,12 @@ unsigned int defaults_read_config(unsign
|
|
|
aea863 |
|
|
|
aea863 |
conf = open_fopen_r(DEFAULT_CONFIG_FILE);
|
|
|
aea863 |
if (!conf)
|
|
|
aea863 |
- message(to_syslog, "failed to to open config %s",
|
|
|
aea863 |
+ message(to_syslog, "failed to open config %s",
|
|
|
aea863 |
DEFAULT_CONFIG_FILE);
|
|
|
aea863 |
|
|
|
aea863 |
oldconf = open_fopen_r(OLD_CONFIG_FILE);
|
|
|
aea863 |
- if (!oldconf)
|
|
|
aea863 |
- message(to_syslog, "failed to to open old config %s",
|
|
|
aea863 |
+ if (!oldconf && !conf)
|
|
|
aea863 |
+ message(to_syslog, "failed to open old config %s",
|
|
|
aea863 |
OLD_CONFIG_FILE);
|
|
|
aea863 |
|
|
|
aea863 |
/* Neither config has been updated */
|