s3: remove now unneeded call to cmdline_messaging_context()

[metze/samba/wip.git] / source3 / utils / sharesec.c

diff --git a/source3/utils/sharesec.c b/source3/utils/sharesec.c
index 2ea81b9adfae977d844d2a7db308a9de270980bb..510505f00327d589c6bd620e0070057c6b7c92ee 100644 (file)
--- a/source3/utils/sharesec.c
+++ b/source3/utils/sharesec.c
@@ -501,7 +501,6 @@ int main(int argc, const char *argv[])
 
        setlinebuf(stdout);
 
-       cmdline_messaging_context(get_dyn_CONFIGFILE());
        lp_load_with_registry_shares(get_dyn_CONFIGFILE());
 
        /* check for initializing secrets.tdb first */
@@ -512,16 +511,19 @@ int main(int argc, const char *argv[])
 
                if ( !sid ) {
                        fprintf( stderr, "Failed to retrieve Machine SID!\n");
-                       return 3;
+                       retval = 3;
+                       goto done;
                }
 
                printf ("%s\n", dom_sid_str_buf(sid, &buf) );
-               return 0;
+               retval = 0;
+               goto done;
        }
 
        if ( mode == SMB_ACL_VIEW && force_acl ) {
                fprintf( stderr, "Invalid combination of -F and -v\n");
-               return -1;
+               retval = -1;
+               goto done;
        }
 
        if (mode == SMB_ACL_VIEW_ALL) {
@@ -547,7 +549,8 @@ int main(int argc, const char *argv[])
 
        if(!poptPeekArg(pc)) {
                poptPrintUsage(pc, stderr, 0);
-               return -1;
+               retval = -1;
+               goto done;
        }
 
        fstrcpy(sharename, poptGetArg(pc));
@@ -556,7 +559,8 @@ int main(int argc, const char *argv[])
 
        if ( snum == -1 && !force_acl ) {
                fprintf( stderr, "Invalid sharename: %s\n", sharename);
-               return -1;
+               retval = -1;
+               goto done;
        }
 
        switch (mode) {
@@ -572,6 +576,7 @@ int main(int argc, const char *argv[])
        }
 
 done:
+       poptFreeContext(pc);
        talloc_destroy(ctx);
 
        return retval;