summaryrefslogtreecommitdiff
path: root/source3/lib
diff options
context:
space:
mode:
authorMichael Adam <obnox@samba.org>2013-09-17 19:10:48 +0200
committerMichael Adam <obnox@samba.org>2013-09-24 07:44:29 +0200
commit658fbefef7f95df6410f98407a6a77dee32c268f (patch)
tree9ef90f41c9062600360ac995af148d6219408604 /source3/lib
parent7cfab6bc8d340c08c513350823c6c65a7e4f5d2e (diff)
downloadsamba-658fbefef7f95df6410f98407a6a77dee32c268f.tar.gz
samba-658fbefef7f95df6410f98407a6a77dee32c268f.tar.bz2
samba-658fbefef7f95df6410f98407a6a77dee32c268f.zip
libsmbconf:registry: add "state directory" to the list of forbidden parameters
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 <obnox@samba.org> Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Diffstat (limited to 'source3/lib')
-rw-r--r--source3/lib/smbconf/smbconf_reg.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/source3/lib/smbconf/smbconf_reg.c b/source3/lib/smbconf/smbconf_reg.c
index 84294ab663..ac6b84d1f5 100644
--- a/source3/lib/smbconf/smbconf_reg.c
+++ b/source3/lib/smbconf/smbconf_reg.c
@@ -58,6 +58,7 @@ bool smbconf_reg_parameter_is_valid(const char *param_name)
{
/* hard code the list of forbidden names here for now */
const char *forbidden_names[] = {
+ "state directory",
"lock directory",
"lock dir",
"config backend",