From bb3ce0cf2108e328c7da1399e0526e1f3d2ab2bedd0f49927180a5b385dcc07c Mon Sep 17 00:00:00 2001
From: Neil Brown <nfbrown@suse.com>
Date: Fri, 27 Mar 2020 05:07:49 +0000
Subject: [PATCH] -
 0001-conffile-Don-t-give-warning-for-optional-config-file.patch   Support
 optional include files correctly   (boo#1164619)

OBS-URL: https://build.opensuse.org/package/show/Base:System/nfs-utils?expand=0&rev=218
---
 ...ive-warning-for-optional-config-file.patch | 33 +++++++++++++++++++
 nfs-utils.changes                             |  7 ++++
 nfs-utils.spec                                |  2 ++
 3 files changed, 42 insertions(+)
 create mode 100644 0001-conffile-Don-t-give-warning-for-optional-config-file.patch

diff --git a/0001-conffile-Don-t-give-warning-for-optional-config-file.patch b/0001-conffile-Don-t-give-warning-for-optional-config-file.patch
new file mode 100644
index 0000000..e96ff4a
--- /dev/null
+++ b/0001-conffile-Don-t-give-warning-for-optional-config-file.patch
@@ -0,0 +1,33 @@
+From 1c20fcd0a315f3c692a465159985e6125289f4e4 Mon Sep 17 00:00:00 2001
+From: NeilBrown <neilb@suse.de>
+Date: Fri, 27 Mar 2020 15:58:24 +1100
+Subject: [PATCH] conffile: Don't give warning for optional config files.
+
+A recent commit added the possibility of optional config files for which
+warning messages would be suppressed.
+Unfortunately only one of the possible warning messages - the least
+likely one - was suppressed.
+
+This patch suppresses the other.
+
+Fixes: c6fdcbe0a5cf ("conffile: allow optional include files")
+Signed-off-by: NeilBrown <neilb@suse.de>
+---
+ support/nfs/conffile.c |    6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+--- a/support/nfs/conffile.c
++++ b/support/nfs/conffile.c
+@@ -429,9 +429,9 @@ conf_parse_line(int trans, char *line, c
+ 
+ 		subconf = conf_readfile(relpath);
+ 		if (subconf == NULL) {
+-			xlog_warn("config error at %s:%d: "
+-				"error loading included config",
+-				  filename, lineno);
++			if (!optional)
++				xlog_warn("config error at %s:%d: error loading included config",
++					  filename, lineno);
+ 			if (relpath)
+ 				free(relpath);
+ 			return;
diff --git a/nfs-utils.changes b/nfs-utils.changes
index 8c8ab63..a5fe4a9 100644
--- a/nfs-utils.changes
+++ b/nfs-utils.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Fri Mar 27 05:06:12 UTC 2020 - Neil Brown <nfbrown@suse.com>
+
+- 0001-conffile-Don-t-give-warning-for-optional-config-file.patch
+  Support optional include files correctly
+  (boo#1164619)
+
 -------------------------------------------------------------------
 Tue Mar 24 10:13:53 UTC 2020 - Petr Vorel <pvorel@suse.cz>
 
diff --git a/nfs-utils.spec b/nfs-utils.spec
index 6ee40c3..140bfc9 100644
--- a/nfs-utils.spec
+++ b/nfs-utils.spec
@@ -46,6 +46,7 @@ Source25:       rpc-svcgssd.options.conf
 Source26:       nfs.conf
 Source27:       nfs-kernel-server.tmpfiles.conf
 Patch0:         nfs-utils-1.0.7-bind-syntax.patch
+Patch1:         0001-conffile-Don-t-give-warning-for-optional-config-file.patch
 
 BuildRequires:  e2fsprogs-devel
 BuildRequires:  fedfs-utils-devel
@@ -144,6 +145,7 @@ This package contains additional NFS documentation.
 %prep
 %setup -q -a 1
 %patch0 -p1
+%patch1 -p1
 
 cp %{SOURCE6} .