diff mbox

[11/15] conffile: ignore setting of empty string

Message ID 148065110977.28046.4258233430833825030.stgit@noble (mailing list archive)
State New, archived
Headers show

Commit Message

NeilBrown Dec. 2, 2016, 3:58 a.m. UTC
A value setting like

   foo =

is now equivalent to not setting "foo" at all.
This is likely to be least confusing.

Signed-off-by: NeilBrown <neilb@suse.com>
---
 support/nfs/conffile.c |    2 ++
 systemd/nfs.conf.man   |    3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)



--
To unsubscribe from this list: send the line "unsubscribe linux-nfs" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/support/nfs/conffile.c b/support/nfs/conffile.c
index 947bf9bad1e7..eaff5f5c35ea 100644
--- a/support/nfs/conffile.c
+++ b/support/nfs/conffile.c
@@ -748,6 +748,8 @@  conf_set(int transaction, char *section, char *arg,
 {
 	struct conf_trans *node;
 
+	if (!value || !*value)
+		return 0;
 	node = conf_trans_node(transaction, CONF_SET);
 	if (!node)
 		return 1;
diff --git a/systemd/nfs.conf.man b/systemd/nfs.conf.man
index 8e2f034d0b9b..8cf55668b664 100644
--- a/systemd/nfs.conf.man
+++ b/systemd/nfs.conf.man
@@ -36,7 +36,8 @@  in the current section to
 Leading and trailing spaces and tab
 are ignored, as are spaces and tabs surrounding the equals sign.
 Single and double quotes surrounding the assigned value are also
-removed.
+removed.  If the resulting string is empty, the whole assignment
+is ignored.
 .PP
 Any line starting with
 .RB \*(lq # \*(rq