summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Leighton <lkcl@samba.org>1998-11-30 19:29:32 +0000
committerLuke Leighton <lkcl@samba.org>1998-11-30 19:29:32 +0000
commitdc879e9ca7382cf981123ed35cdd3cace0abf5be (patch)
tree887dc5fdd737d213b49c99d99b41fa145d3ebee7
parent0a02d17577d4743ff84f6dec16563644798923d6 (diff)
downloadsamba-dc879e9ca7382cf981123ed35cdd3cace0abf5be.tar.gz
samba-dc879e9ca7382cf981123ed35cdd3cace0abf5be.tar.bz2
samba-dc879e9ca7382cf981123ed35cdd3cace0abf5be.zip
pwdb_initialise() in the wrong place: must load smb.conf first. thanks phil.
(This used to be commit 4b5bd4e18cee72aeb76909cf85b1f932393fcfc8)
-rw-r--r--source3/utils/smbpasswd.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/source3/utils/smbpasswd.c b/source3/utils/smbpasswd.c
index 92ec9ae5a8..a5756dd797 100644
--- a/source3/utils/smbpasswd.c
+++ b/source3/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");