r24872: Use torture API a bit more

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

diff --git a/source4/torture/masktest.c b/source4/torture/masktest.c
index 964d000d49833c6c2416d947f3af14c70ed06de3..3eac50cbca4f84e91b3e2a25c824daea57b431fb 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,17 +14,20 @@
    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 "client.h"
+#include "system/filesys.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"
 
-static fstring password;
-static fstring username;
+static struct cli_credentials *credentials;
 static BOOL showall = False;
 static BOOL old_list = False;
 static const char *maskchars = "<>\"?*abc.";
@@ -39,9 +42,9 @@ static BOOL reg_match_one(struct smbcli_state *cli, const char *pattern, const c
        /* oh what a weird world this is */
        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;
 }
@@ -68,7 +71,6 @@ static struct smbcli_state *connect_one(char *share)
 {
        struct smbcli_state *c;
        fstring server;
-       uint_t flags = 0;
        NTSTATUS status;
 
        fstrcpy(server,share+2);
@@ -77,11 +79,12 @@ static struct smbcli_state *connect_one(char *share)
        *share = 0;
        share++;
 
-       status = smbcli_full_connection(NULL, &c, "masktest",
-                                    server, NULL, 
-                                    share, "?????", 
-                                    username, lp_workgroup(), 
-                                    password, flags, NULL);
+       cli_credentials_set_workstation(credentials, "masktest", CRED_SPECIFIED);
+
+       status = smbcli_full_connection(NULL, &c,
+                                       server, 
+                                       share, NULL,
+                                       credentials, NULL);
 
        if (!NT_STATUS_IS_OK(status)) {
                return NULL;
@@ -97,11 +100,11 @@ static struct {
 } last_hit;
 static BOOL f_info_hit;
 
-static void listfn(struct file_info *f, const char *s, void *state)
+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] = '+';
@@ -125,7 +128,7 @@ static void get_real_name(struct smbcli_state *cli,
 
        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) {
@@ -166,7 +169,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);
@@ -180,6 +183,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[], 
@@ -223,9 +228,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;
 
@@ -273,7 +278,6 @@ static void usage(void)
        char *share;
        struct smbcli_state *cli;       
        int opt;
-       char *p;
        int seed;
 
        setlinebuf(stdout);
@@ -296,12 +300,10 @@ static void usage(void)
        argc -= 1;
        argv += 1;
 
-       lp_load(dyn_CONFIGFILE,True,False,False);
-       load_interfaces();
+       lp_load();
 
-       if (getenv("USER")) {
-               fstrcpy(username,getenv("USER"));
-       }
+       credentials = cli_credentials_init(talloc_autofree_context());
+       cli_credentials_guess(credentials);
 
        seed = time(NULL);
 
@@ -325,12 +327,7 @@ static void usage(void)
                        lp_set_cmdline("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);
@@ -359,10 +356,11 @@ static void usage(void)
                }
        }
 
+       gensec_init();
+
        argc -= optind;
        argv += optind;
 
-
        cli = connect_one(share);
        if (!cli) {
                DEBUG(0,("Failed to connect to %s\n", share));