Changeset 165 for branches/samba-3.0/source/smbd/trans2.c

Timestamp:

Mar 11, 2009, 9:14:55 AM (16 years ago)

Author:

Paul Smedley

Message:

Add 'missing' 3.0.34 diffs

File:

• branches/samba-3.0/source/smbd/trans2.c (modified) (6 diffs)

branches/samba-3.0/source/smbd/trans2.c

@@ -205 +205 @@
         }
 
-        if (sizeret == -1){
-                return NULL;}
+        if (sizeret == -1)
+                return NULL;
 
         DEBUG(10,("get_ea_list_from_file: ea_namelist size = %u\n", (unsigned int)sizeret ));
@@ -303 +303 @@
         size_t total_ea_len = 0;
         TALLOC_CTX *mem_ctx = NULL;
+
         if (!lp_ea_support(SNUM(conn))) {
                 return 0;
@@ -865 +866 @@
                         return ERROR_NT(NT_STATUS_INVALID_PARAMETER);
                 }
-        } else if (IVAL(pdata,0) != 4) {
-                return ERROR_NT(NT_STATUS_INVALID_PARAMETER);
         }
 
@@ -977 +976 @@
         if (mask[0] == '.' && mask[1] == 0)
                 return False;
+        if (dptr_has_wild(conn->dirptr)) {
+                return False;
+        }
         if (conn->case_sensitive)
                 return strcmp(str,mask)==0;
-        if (StrCaseCmp(str,mask) != 0) {
-                return False;
-        }
-        if (dptr_has_wild(conn->dirptr)) {
-                return False;
-        }
-        return True;
+        else
+                return StrCaseCmp(str,mask) == 0;
 }
 
@@ -4162 +4159 @@
                         fsp_set_pending_modtime(fsp, ts[1]);
                 }
+
         }
 #ifdef __OS2__
@@ -6190 +6188 @@
                 return ERROR_NT(NT_STATUS_INVALID_PARAMETER);
         }
+        /* If total_data == 4 Windows doesn't care what values
+         * are placed in that field, it just ignores them.
+         * The System i QNTC IBM SMB client puts bad values here,
+         * so ignore them. */
 
         status = create_directory(conn, directory);