r26355: Eliminate global_loadparm in more places.

[ambi/samba-autobuild/.git] / source4 / torture / masktest.c

diff --git a/source4/torture/masktest.c b/source4/torture/masktest.c
index 4c71385ad09ca465f248716cbeacb08713be885d..dab81937537084da5f7a118c7abc36decdefeb93 100644 (file)
--- a/source4/torture/masktest.c
+++ b/source4/torture/masktest.c
@@ -5,7 +5,7 @@
    
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
+   the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
    
    This program is distributed in the hope that it will be useful,
@@ -14,21 +14,24 @@
    GNU General Public License for more details.
    
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "includes.h"
 #include "system/filesys.h"
-#include "dynconfig.h"
-#include "clilist.h"
+#include "system/dir.h"
+#include "libcli/libcli.h"
 #include "libcli/raw/libcliraw.h"
 #include "system/time.h"
+#include "pstring.h"
+#include "auth/credentials/credentials.h"
+#include "auth/gensec/gensec.h"
+#include "param/param.h"
+#include "dynconfig.h"
 
-static fstring password;
-static fstring username;
-static BOOL showall = False;
-static BOOL old_list = False;
+static struct cli_credentials *credentials;
+static bool showall = false;
+static bool old_list = false;
 static const char *maskchars = "<>\"?*abc.";
 static const char *filechars = "abcdefghijklm.";
 static int verbose;
@@ -36,14 +39,14 @@ static int die_on_error;
 static int NumLoops = 0;
 static int max_length = 20;
 
-static BOOL reg_match_one(struct smbcli_state *cli, const char *pattern, const char *file)
+static bool reg_match_one(struct smbcli_state *cli, const char *pattern, const char *file)
 {
        /* oh what a weird world this is */
-       if (old_list && strcmp(pattern, "*.*") == 0) return True;
+       if (old_list && strcmp(pattern, "*.*") == 0) return true;
 
-       if (strcmp(pattern,".") == 0) return False;
+       if (ISDOT(pattern)) return false;
 
-       if (strcmp(file,"..") == 0) file = ".";
+       if (ISDOTDOT(file)) file = ".";
 
        return ms_fnmatch(pattern, file, cli->transport->negotiate.protocol)==0;
 }
@@ -78,11 +81,12 @@ static struct smbcli_state *connect_one(char *share)
        *share = 0;
        share++;
 
-       status = smbcli_full_connection(NULL, &c, "masktest",
+       cli_credentials_set_workstation(credentials, "masktest", CRED_SPECIFIED);
+
+       status = smbcli_full_connection(NULL, &c,
                                        server, 
                                        share, NULL,
-                                       username, lp_workgroup(), 
-                                       password);
+                                       credentials, NULL);
 
        if (!NT_STATUS_IS_OK(status)) {
                return NULL;
@@ -96,20 +100,20 @@ static struct {
        pstring long_name;
        pstring short_name;
 } last_hit;
-static BOOL f_info_hit;
+static bool f_info_hit;
 
 static void listfn(struct clilist_file_info *f, const char *s, void *state)
 {
-       if (strcmp(f->name,".") == 0) {
+       if (ISDOT(f->name)) {
                resultp[0] = '+';
-       } else if (strcmp(f->name,"..") == 0) {
+       } else if (ISDOTDOT(f->name)) {
                resultp[1] = '+';               
        } else {
                resultp[2] = '+';
        }
        pstrcpy(last_hit.long_name, f->name);
        pstrcpy(last_hit.short_name, f->short_name);
-       f_info_hit = True;
+       f_info_hit = true;
 }
 
 static void get_real_name(struct smbcli_state *cli, 
@@ -122,11 +126,11 @@ static void get_real_name(struct smbcli_state *cli,
                mask = "\\masktest\\*";
        }
 
-       f_info_hit = False;
+       f_info_hit = false;
 
        smbcli_list_new(cli->tree, mask, 
                        FILE_ATTRIBUTE_HIDDEN | FILE_ATTRIBUTE_DIRECTORY, 
-                       RAW_SEARCH_BOTH_DIRECTORY_INFO,
+                       RAW_SEARCH_DATA_BOTH_DIRECTORY_INFO,
                        listfn, NULL);
 
        if (f_info_hit) {
@@ -167,7 +171,7 @@ static void testpair(struct smbcli_state *cli, char *mask, char *file)
        fstrcpy(res1, "---");
        smbcli_list_new(cli->tree, mask, 
                        FILE_ATTRIBUTE_HIDDEN | FILE_ATTRIBUTE_DIRECTORY, 
-                       RAW_SEARCH_BOTH_DIRECTORY_INFO,
+                       RAW_SEARCH_DATA_BOTH_DIRECTORY_INFO,
                        listfn, NULL);
 
        res2 = reg_test(cli, mask, long_name, short_name);
@@ -181,6 +185,8 @@ static void testpair(struct smbcli_state *cli, char *mask, char *file)
        smbcli_unlink(cli->tree, file);
 
        if (count % 100 == 0) DEBUG(0,("%d\n", count));
+
+       resultp = NULL;
 }
 
 static void test_mask(int argc, char *argv[], 
@@ -224,9 +230,9 @@ static void test_mask(int argc, char *argv[],
                }
                file[l+l2] = 0;
 
-               if (strcmp(file+l,".") == 0 || 
-                   strcmp(file+l,"..") == 0 ||
-                   strcmp(mask+l,"..") == 0) continue;
+               if (ISDOT(file+l) || ISDOTDOT(file+l) || ISDOTDOT(mask+l)) {
+                       continue;
+               }
 
                if (strspn(file+l, ".") == strlen(file+l)) continue;
 
@@ -274,14 +280,14 @@ static void usage(void)
        char *share;
        struct smbcli_state *cli;       
        int opt;
-       char *p;
        int seed;
+       struct loadparm_context *lp_ctx;
 
        setlinebuf(stdout);
 
        setup_logging("masktest", DEBUG_STDOUT);
 
-       lp_set_cmdline("log level", "0");
+       lp_set_cmdline(global_loadparm, "log level", "0");
 
        if (argc < 2 || argv[1][0] == '-') {
                usage();
@@ -297,16 +303,15 @@ static void usage(void)
        argc -= 1;
        argv += 1;
 
-       lp_load(dyn_CONFIGFILE,True,False,False);
-       load_interfaces();
+       lp_ctx = loadparm_init(talloc_autofree_context());
+       lp_load(lp_ctx, dyn_CONFIGFILE);
 
-       if (getenv("USER")) {
-               fstrcpy(username,getenv("USER"));
-       }
+       credentials = cli_credentials_init(talloc_autofree_context());
+       cli_credentials_guess(credentials, lp_ctx);
 
        seed = time(NULL);
 
-       init_iconv();
+       reload_charcnv();
 
        while ((opt = getopt(argc, argv, "n:d:U:s:hm:f:aoW:M:vEl:")) != EOF) {
                switch (opt) {
@@ -323,15 +328,10 @@ static void usage(void)
                        verbose++;
                        break;
                case 'M':
-                       lp_set_cmdline("max protocol", optarg);
+                       lp_set_cmdline(lp_ctx, "max protocol", optarg);
                        break;
                case 'U':
-                       fstrcpy(username,optarg);
-                       p = strchr_m(username,'%');
-                       if (p) {
-                               *p = 0;
-                               fstrcpy(password, p+1);
-                       }
+                       cli_credentials_parse_string(credentials, optarg, CRED_SPECIFIED);
                        break;
                case 's':
                        seed = atoi(optarg);
@@ -352,7 +352,7 @@ static void usage(void)
                        showall = 1;
                        break;
                case 'o':
-                       old_list = True;
+                       old_list = true;
                        break;
                default:
                        printf("Unknown option %c (%d)\n", (char)opt, opt);
@@ -360,7 +360,7 @@ static void usage(void)
                }
        }
 
-       masktest_init_subsystems;
+       gensec_init(lp_ctx);
 
        argc -= optind;
        argv += optind;