s3:smbpasswd: Use cmdline_messaging_context

[samba.git] / source3 / utils / smbpasswd.c

diff --git a/source3/utils/smbpasswd.c b/source3/utils/smbpasswd.c
index 04f34aa9b695e49eed87476d406a1507be9cf4db..8e2b9d7f80fda7ad9d56df5af5058d25766a883b 100644 (file)
--- a/source3/utils/smbpasswd.c
+++ b/source3/utils/smbpasswd.c
@@ -23,6 +23,7 @@
 #include "../lib/util/util_pw.h"
 #include "libsmb/proto.h"
 #include "passdb.h"
+#include "cmdline_contexts.h"
 
 /*
  * Next two lines needed for SunOS and don't
@@ -196,6 +197,8 @@ static int process_options(int argc, char **argv, int local_flags)
                usage();
        }
 
+       cmdline_messaging_context(configfile);
+
        if (!lp_load_global(configfile)) {
                fprintf(stderr, "Can't load %s - run testparm to debug it\n", 
                        configfile);
@@ -614,7 +617,6 @@ static int process_nonroot(int local_flags)
 int main(int argc, char **argv)
 {      
        TALLOC_CTX *frame = talloc_stackframe();
-       struct messaging_context *msg_ctx = NULL;
        int local_flags = 0;
        int ret;
 
@@ -632,19 +634,6 @@ int main(int argc, char **argv)
 
        setup_logging("smbpasswd", DEBUG_STDERR);
 
-       msg_ctx = server_messaging_context();
-       if (msg_ctx == NULL) {
-               if (geteuid() != 0) {
-                       DBG_NOTICE("Unable to initialize messaging context. "
-                                  "Must be root to do that.\n");
-               } else {
-                       fprintf(stderr,
-                               "smbpasswd is not able to initialize the "
-                               "messaging context!\n");
-                       return 1;
-               }
-       }
-
        /*
         * Set the machine NETBIOS name if not already
         * set from the config file.