From 0171718122a7244439f5004cdd8189293839afac Mon Sep 17 00:00:00 2001 From: Michael Adam Date: Tue, 17 Sep 2013 19:10:48 +0200 Subject: [PATCH] smbconf: add "state directory" to the list of forbidden parameters for registry config At the time when the registry configuration was introduced, the registry database file was placed in the "lock directory". So the "lock directory" was added to the list of parameters that may not be changed in the registry configuration (because the next config reload would then load a different registry and drop all the original seetings). Later, "state directory" and "cache directory" were introduced, both defaulting to "lock directory". And the registry's location was changed to "state directory". It slipped my attention that the forbidden parameters for the should have been adapted at the time. So this patch adds "state directory" to the list. It keeps the lock directory, to catch the case where the state directory is not explicitly set, hence defaulting to the "lock directory". Signed-off-by: Michael Adam --- source3/lib/smbconf/smbconf_reg.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/source3/lib/smbconf/smbconf_reg.c b/source3/lib/smbconf/smbconf_reg.c index ec6b93f..21f65a8 100644 --- a/source3/lib/smbconf/smbconf_reg.c +++ b/source3/lib/smbconf/smbconf_reg.c @@ -57,6 +57,8 @@ static bool smbconf_reg_valname_forbidden(const char *valname) { /* hard code the list of forbidden names here for now */ const char *forbidden_valnames[] = { + "state directory", + "state dir", "lock directory", "lock dir", "config backend", -- 1.7.9.5