summaryrefslogtreecommitdiff
path: root/source3/param
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2008-02-15 09:35:18 -0800
committerJeremy Allison <jra@samba.org>2008-02-15 09:35:18 -0800
commit0e57795f86fafe541d826deb6d49e77e5644a024 (patch)
tree9b663339dd634f0a6c6565422c2c1e5ccb06c3b8 /source3/param
parent4737a35ac81803275f2c1edc860a87f31d14f2eb (diff)
parentabdedc7940b187789ffc583dabc778f824039095 (diff)
downloadsamba-0e57795f86fafe541d826deb6d49e77e5644a024.tar.gz
samba-0e57795f86fafe541d826deb6d49e77e5644a024.tar.bz2
samba-0e57795f86fafe541d826deb6d49e77e5644a024.zip
Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into v3-2-test
(This used to be commit 847874ca757ac8ca32082305c8caed5abc7fed1d)
Diffstat (limited to 'source3/param')
-rw-r--r--source3/param/loadparm.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index 3737224275..29de336df5 100644
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -3561,7 +3561,7 @@ static bool process_registry_globals(bool (*pfunc)(const char *, const char *))
smb_panic("Failed to create talloc context!");
}
- if (!registry_init_regdb()) {
+ if (!registry_init_smbconf()) {
DEBUG(1, ("Error initializing the registry.\n"));
goto done;
}