Changeset 370 for branches/samba-3.3.x/source/smbd/trans2.c

Timestamp:

Jan 15, 2010, 8:23:30 AM (16 years ago)

Author:

Herwig Bauernfeind

Message:

Update Samba 3.3 to 3.3.10 (source)

File:

• branches/samba-3.3.x/source/smbd/trans2.c (modified) (11 diffs)

branches/samba-3.3.x/source/smbd/trans2.c

@@ -1280 +1280 @@
         char *last_entry_ptr;
         bool was_8_3;
-        uint32 nt_extmode; /* Used for NT connections instead of mode */
         bool needslash = ( conn->dirpath[strlen(conn->dirpath) -1] != '/');
         bool check_mangled_names = lp_manglednames(conn->params);
@@ -1466 +1465 @@
         p = pdata;
         last_entry_ptr = p;
-
-        nt_extmode = mode ? mode : FILE_ATTRIBUTE_NORMAL;
 
         switch (info_level) {
@@ -1615 +1612 @@
                         SOFF_T(p,0,file_size); p += 8;
                         SOFF_T(p,0,allocation_size); p += 8;
-                        SIVAL(p,0,nt_extmode); p += 4;
+                        SIVAL(p,0,mode); p += 4;
                         q = p; p += 4; /* q is placeholder for name length. */
                         {
@@ -1666 +1663 @@
                         SOFF_T(p,0,file_size); p += 8;
                         SOFF_T(p,0,allocation_size); p += 8;
-                        SIVAL(p,0,nt_extmode); p += 4;
+                        SIVAL(p,0,mode); p += 4;
                         len = srvstr_push(base_data, flags2,
                                           p + 4, fname, PTR_DIFF(end_data, p+4),
@@ -1689 +1686 @@
                         SOFF_T(p,0,file_size); p += 8;
                         SOFF_T(p,0,allocation_size); p += 8;
-                        SIVAL(p,0,nt_extmode); p += 4;
+                        SIVAL(p,0,mode); p += 4;
                         q = p; p += 4; /* q is placeholder for name length. */
                         {
@@ -1738 +1735 @@
                         SOFF_T(p,0,file_size); p += 8;
                         SOFF_T(p,0,allocation_size); p += 8;
-                        SIVAL(p,0,nt_extmode); p += 4;
+                        SIVAL(p,0,mode); p += 4;
                         q = p; p += 4; /* q is placeholder for name length. */
                         {
@@ -1771 +1768 @@
                         SOFF_T(p,0,file_size); p += 8;
                         SOFF_T(p,0,allocation_size); p += 8;
-                        SIVAL(p,0,nt_extmode); p += 4;
+                        SIVAL(p,0,mode); p += 4;
                         q = p; p += 4; /* q is placeholder for name length */
                         {
@@ -2270 +2267 @@
         continue_bit = (findnext_flags & FLAG_TRANS2_FIND_CONTINUE);
 
-        srvstr_get_path_wcard(ctx, params, req->flags2, &resume_name,
+        if (!continue_bit) {
+                /* We only need resume_name if continue_bit is zero. */
+                srvstr_get_path_wcard(ctx, params, req->flags2, &resume_name,
                               params+12,
                               total_params - 12, STR_TERMINATE, &ntstatus,
                               &mask_contains_wcard);
-        if (!NT_STATUS_IS_OK(ntstatus)) {
-                /* Win9x or OS/2 can send a resume name of ".." or ".". This will cause the parser to
-                   complain (it thinks we're asking for the directory above the shared
-                   path or an invalid name). Catch this as the resume name is only compared, never used in
-                   a file access. JRA. */
-                srvstr_pull_talloc(ctx, params, req->flags2,
+                if (!NT_STATUS_IS_OK(ntstatus)) {
+                        /* Win9x or OS/2 can send a resume name of ".." or ".". This will cause the parser to
+                           complain (it thinks we're asking for the directory above the shared
+                           path or an invalid name). Catch this as the resume name is only compared, never used in
+                           a file access. JRA. */
+                        srvstr_pull_talloc(ctx, params, req->flags2,
                                 &resume_name, params+12,
                                 total_params - 12,
                                 STR_TERMINATE);
 
-                if (!resume_name || !(ISDOT(resume_name) || ISDOTDOT(resume_name))) {
-                        reply_nterror(req, ntstatus);
-                        return;
+                        if (!resume_name || !(ISDOT(resume_name) || ISDOTDOT(resume_name))) {
+                                reply_nterror(req, ntstatus);
+                                return;
+                        }
                 }
         }
@@ -2294 +2294 @@
 resume_key = %d resume name = %s continue=%d level = %d\n",
                 dptr_num, max_data_bytes, maxentries, close_after_request, close_if_end, 
-                requires_resume_key, resume_key, resume_name, continue_bit, info_level));
+                requires_resume_key, resume_key,
+                resume_name ? resume_name : "(NULL)", continue_bit, info_level));
 
         if (!maxentries) {
@@ -2416 +2417 @@
          */
 
-        if(*resume_name && !continue_bit) {
+        if(!continue_bit && resume_name && *resume_name) {
                 SMB_STRUCT_STAT st;
 
@@ -4078 +4079 @@
                 mode = dos_mode(conn,fname,&sbuf);
         }
-        if (!mode)
-                mode = FILE_ATTRIBUTE_NORMAL;
 
         nlink = sbuf.st_nlink;