libndr: Avoid assigning duplicate versions to symbols

[amitay/samba.git] / source4 / torture / masktest.c

diff --git a/source4/torture/masktest.c b/source4/torture/masktest.c
index a711634b24c7896ffa5224f4332e077e07648138..35ec2e9d040eee934e2e73a1c906a7e92276fd7f 100644 (file)
--- a/source4/torture/masktest.c
+++ b/source4/torture/masktest.c
@@ -49,7 +49,8 @@ static bool reg_match_one(struct smbcli_state *cli, const char *pattern, const c
 
        if (ISDOTDOT(file)) file = ".";
 
-       return ms_fnmatch_protocol(pattern, file, cli->transport->negotiate.protocol)==0;
+       return ms_fnmatch_protocol(
+               pattern, file, cli->transport->negotiate.protocol, false)==0;
 }
 
 static char *reg_test(struct smbcli_state *cli, TALLOC_CTX *mem_ctx, const char *pattern, const char *long_name, const char *short_name)
@@ -89,14 +90,16 @@ static struct smbcli_state *connect_one(struct resolve_context *resolve_ctx,
        *share = 0;
        share++;
 
-       cli_credentials_set_workstation(cmdline_credentials, "masktest", CRED_SPECIFIED);
+       cli_credentials_set_workstation(popt_get_cmdline_credentials(),
+                       "masktest", CRED_SPECIFIED);
 
        status = smbcli_full_connection(NULL, &c,
                                        server, 
                                        ports,
                                        share, NULL,
                                        socket_options,
-                                       cmdline_credentials, resolve_ctx, ev,
+                                       popt_get_cmdline_credentials(),
+                                       resolve_ctx, ev,
                                        options, session_options,
                                        gensec_settings);
 
@@ -157,7 +160,7 @@ static void get_real_name(TALLOC_CTX *mem_ctx, struct smbcli_state *cli,
                *long_name = strlower_talloc(mem_ctx, last_hit.long_name);
        }
 
-       if (*short_name == '\0') {
+       if (*short_name[0] == '\0') {
                *short_name = talloc_strdup(mem_ctx, *long_name);
        }
 }
@@ -267,7 +270,6 @@ static void test_mask(int argc, char *argv[],
 
  finished:
        smbcli_rmdir(cli->tree, "\\masktest");
-       talloc_free(mem_ctx);
 }
 
 
@@ -286,7 +288,7 @@ static void usage(poptContext pc)
 /****************************************************************************
   main program
 ****************************************************************************/
- int main(int argc,char *argv[])
+int main(int argc, const char *argv[])
 {
        char *share;
        struct smbcli_state *cli;       
@@ -299,7 +301,7 @@ static void usage(poptContext pc)
        poptContext pc;
        int argc_new, i;
        char **argv_new;
-       TALLOC_CTX *mem_ctx;
+       TALLOC_CTX *mem_ctx = NULL;
        enum {OPT_UNCLIST=1000};
        struct poptOption long_options[] = {
                POPT_AUTOHELP
@@ -315,13 +317,18 @@ static void usage(poptContext pc)
                POPT_COMMON_CONNECTION
                POPT_COMMON_CREDENTIALS
                POPT_COMMON_VERSION
-               { NULL }
+               {0}
        };
 
        setlinebuf(stdout);
        seed = time(NULL);
 
-       pc = poptGetContext("locktest", argc, (const char **) argv, long_options, 
+       mem_ctx = talloc_named_const(NULL, 0, "masktest_ctx");
+       if (mem_ctx == NULL) {
+               exit(1);
+       }
+
+       pc = poptGetContext("locktest", argc, argv, long_options,
                            POPT_CONTEXT_KEEP_FIRST);
 
        poptSetOtherOptionHelp(pc, "<unc>");
@@ -345,6 +352,7 @@ static void usage(poptContext pc)
 
        if (!(argc_new >= 2)) {
                usage(pc);
+               talloc_free(mem_ctx);
                exit(1);
        }
 
@@ -356,8 +364,6 @@ static void usage(poptContext pc)
 
        lp_ctx = cmdline_lp_ctx;
 
-       mem_ctx = talloc_autofree_context();
-
        ev = s4_event_context_init(mem_ctx);
 
        gensec_init();
@@ -371,6 +377,7 @@ static void usage(poptContext pc)
                          lpcfg_gensec_settings(mem_ctx, lp_ctx));
        if (!cli) {
                DEBUG(0,("Failed to connect to %s\n", share));
+               talloc_free(mem_ctx);
                exit(1);
        }
 
@@ -380,5 +387,7 @@ static void usage(poptContext pc)
 
        test_mask(argc_new-1, argv_new+1, mem_ctx, cli);
 
+       poptFreeContext(pc);
+       talloc_free(mem_ctx);
        return(0);
 }