Don't try and open tdb secrets file in non-root/local mode.

Jeremy.
(This used to be commit e78a114425129d980f79db812dbea368123913ed)

diff --git a/source3/utils/smbpasswd.c b/source3/utils/smbpasswd.c
index a10e757910970d379dceab757203f19dfd57137d..cfc8ac6aa1dd5583726f2cd4ec7bf3b85f03852f 100644 (file)
--- a/source3/utils/smbpasswd.c
+++ b/source3/utils/smbpasswd.c
@@ -925,8 +925,6 @@ int main(int argc, char **argv)
        }           
        strupper(global_myname);
 
-       secrets_init();
-
        /* 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");
@@ -941,6 +939,7 @@ int main(int argc, char **argv)
        }
 
        if (local_mode || getuid() == 0) {
+               secrets_init();
                return process_root(argc, argv);
        }