From 1321dda51bf3fd208d77cebafc14fec2800cc10d Mon Sep 17 00:00:00 2001 From: Michael Adam Date: Wed, 9 Apr 2008 18:46:02 +0200 Subject: libsmbconf: let set_includes delete the includes paramter when given an empty list instead of complaining Michael (This used to be commit 0dc1fd68598529891429fb29ab1f561fb434bf38) --- source3/lib/smbconf/smbconf_reg.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'source3/lib/smbconf') diff --git a/source3/lib/smbconf/smbconf_reg.c b/source3/lib/smbconf/smbconf_reg.c index fbc8577835..d43c6a15f1 100644 --- a/source3/lib/smbconf/smbconf_reg.c +++ b/source3/lib/smbconf/smbconf_reg.c @@ -984,8 +984,15 @@ static WERROR smbconf_reg_set_includes(struct smbconf_ctx *ctx, goto done; } - werr = smbconf_reg_set_multi_sz_value(key, INCLUDES_VALNAME, - num_includes, includes); + if (num_includes == 0) { + if (!smbconf_value_exists(key, INCLUDES_VALNAME)) { + goto done; + } + werr = reg_deletevalue(key, INCLUDES_VALNAME); + } else { + werr = smbconf_reg_set_multi_sz_value(key, INCLUDES_VALNAME, + num_includes, includes); + } done: TALLOC_FREE(tmp_ctx); -- cgit