pwdb_initialise() in the wrong place: must load smb.conf first. thanks phil.

1 files changed, 6 insertions, 6 deletions

diff --git a/source/utils/smbpasswd.c b/source/utils/smbpasswd.c
index 92ec9ae5a85..a5756dd7979 100644
--- a/source/utils/smbpasswd.c
+++ b/source/utils/smbpasswd.c
@@ -548,12 +548,6 @@ int main(int argc, char **argv)
 	
 	charset_initialise();
 	
-	if(!pwdb_initialise())
-	{
-		fprintf(stderr, "Can't setup password database vectors.\n");
-		exit(1);
-	}
-
 	if (!lp_load(servicesf,True,False,False)) {
 		fprintf(stderr, "Can't load %s - run testparm to debug it\n", 
 			servicesf);
@@ -580,6 +574,12 @@ int main(int argc, char **argv)
 
 	codepage_initialise(lp_client_code_page());
 
+	if(!pwdb_initialise())
+	{
+		fprintf(stderr, "Can't setup password database vectors.\n");
+		exit(1);
+	}
+
 	/* Check the effective uid - make sure we are not setuid */
 	if ((geteuid() == (uid_t)0) && (getuid() != (uid_t)0)) {
 		fprintf(stderr, "smbpasswd must *NOT* be setuid root.\n");