Changeset 745 for trunk/server/source3/torture/masktest.c

Timestamp:

Nov 27, 2012, 4:43:17 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: updated trunk to 3.6.0

Location:

trunk/server

Files:

• . (modified) (1 prop)
• source3/torture/masktest.c (modified) (12 diffs)

trunk/server/source3/torture/masktest.c

@@ -19 +19 @@
 
 #include "includes.h"
+#include "system/filesys.h"
+#include "trans2.h"
+#include "libsmb/libsmb.h"
+#include "libsmb/nmblib.h"
 
 static fstring password;
@@ -35 +39 @@
 extern char *optarg;
 extern int optind;
-extern bool AllowDebugChange;
 
 /* a test fn for LANMAN mask support */
@@ -228 +231 @@
         }
 
-        if (!NT_STATUS_IS_OK(cli_session_setup(c, username, 
-                                               password, strlen(password),
-                                               password, strlen(password),
-                                               lp_workgroup()))) {
-                DEBUG(0,("session setup failed: %s\n", cli_errstr(c)));
+        status = cli_session_setup(c, username,
+                                   password, strlen(password),
+                                   password, strlen(password),
+                                   lp_workgroup());
+        if (!NT_STATUS_IS_OK(status)) {
+                DEBUG(0, ("session setup failed: %s\n", nt_errstr(status)));
                 return NULL;
         }
@@ -264 +268 @@
 
 static char *resultp;
-static file_info *f_info;
-
-static void listfn(const char *mnt, file_info *f, const char *s, void *state)
-{
+
+struct rn_state {
+        char **pp_long_name;
+        char *short_name;
+};
+
+static NTSTATUS listfn(const char *mnt, struct file_info *f, const char *s,
+                   void *private_data)
+{
+        struct rn_state *state = (struct rn_state *)private_data;
         if (strcmp(f->name,".") == 0) {
                 resultp[0] = '+';
@@ -275 +285 @@
                 resultp[2] = '+';
         }
-        f_info = f;
+
+        if (state == NULL) {
+                return NT_STATUS_INTERNAL_ERROR;
+        }
+
+        if (ISDOT(f->name) || ISDOTDOT(f->name))  {
+                return NT_STATUS_OK;
+        }
+
+        fstrcpy(state->short_name, f->short_name);
+        strlower_m(state->short_name);
+        *state->pp_long_name = SMB_STRDUP(f->name);
+        if (!*state->pp_long_name) {
+                return NT_STATUS_NO_MEMORY;
+        }
+        strlower_m(*state->pp_long_name);
+        return NT_STATUS_OK;
 }
 
@@ -281 +307 @@
                           char **pp_long_name, fstring short_name)
 {
+        struct rn_state state;
+
+        state.pp_long_name = pp_long_name;
+        state.short_name = short_name;
+
         *pp_long_name = NULL;
         /* nasty hack to force level 260 listings - tridge */
-        cli->capabilities |= CAP_NT_SMBS;
         if (max_protocol <= PROTOCOL_LANMAN1) {
-                cli_list_new(cli, "\\masktest\\*.*", aHIDDEN | aDIR, listfn, NULL);
+                cli_list_trans(cli, "\\masktest\\*.*", FILE_ATTRIBUTE_HIDDEN | FILE_ATTRIBUTE_DIRECTORY,
+                               SMB_FIND_FILE_BOTH_DIRECTORY_INFO, listfn,
+                               &state);
         } else {
-                cli_list_new(cli, "\\masktest\\*", aHIDDEN | aDIR, listfn, NULL);
-        }
-        if (f_info) {
-                fstrcpy(short_name, f_info->short_name);
-                strlower_m(short_name);
-                *pp_long_name = SMB_STRDUP(f_info->name);
-                if (!*pp_long_name) {
-                        return;
-                }
-                strlower_m(*pp_long_name);
+                cli_list_trans(cli, "\\masktest\\*", FILE_ATTRIBUTE_HIDDEN | FILE_ATTRIBUTE_DIRECTORY,
+                               SMB_FIND_FILE_BOTH_DIRECTORY_INFO,
+                               listfn, &state);
         }
 
@@ -331 +356 @@
         resultp = res1;
         fstrcpy(short_name, "");
-        f_info = NULL;
         get_real_name(cli, &long_name, short_name);
         if (!long_name) {
                 return;
         }
-        f_info = NULL;
         fstrcpy(res1, "---");
-        cli_list(cli, mask, aHIDDEN | aDIR, listfn, NULL);
+        cli_list(cli, mask, FILE_ATTRIBUTE_HIDDEN | FILE_ATTRIBUTE_DIRECTORY, listfn, NULL);
 
         res2 = reg_test(cli, mask, long_name, short_name);
@@ -350 +373 @@
         }
 
-        cli_unlink(cli, file, aSYSTEM | aHIDDEN);
+        cli_unlink(cli, file, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
 
         if (count % 100 == 0) DEBUG(0,("%d\n", count));
@@ -367 +390 @@
         cli_mkdir(cli, "\\masktest");
 
-        cli_unlink(cli, "\\masktest\\*", aSYSTEM | aHIDDEN);
+        cli_unlink(cli, "\\masktest\\*", FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
 
         if (argc >= 2) {
@@ -466 +489 @@
         setlinebuf(stdout);
 
-        dbf = x_stderr;
-
-        DEBUGLEVEL = 0;
-        AllowDebugChange = False;
+        lp_set_cmdline("log level", "0");
 
         if (argc < 2 || argv[1][0] == '-') {
@@ -480 +500 @@
         all_string_sub(share,"/","\\",0);
 
-        setup_logging(argv[0],True);
+        setup_logging(argv[0], DEBUG_STDERR);
 
         argc -= 1;
         argv += 1;
 
+        load_case_tables();
         lp_load(get_dyn_CONFIGFILE(),True,False,False,True);
         load_interfaces();
@@ -500 +521 @@
                         break;
                 case 'd':
-                        DEBUGLEVEL = atoi(optarg);
+                        lp_set_cmdline("log level", optarg);
                         break;
                 case 'E':