Changeset 454 for trunk/server/source3/smbd/trans2.c

Timestamp:

Jun 4, 2010, 3:11:43 PM (15 years ago)

Author:

Silvan Scherrer

Message:

Samba Server 3.5: merged changes from 3.3

File:

• trunk/server/source3/smbd/trans2.c (modified) (5 diffs)

trunk/server/source3/smbd/trans2.c

@@ -128 +128 @@
 
         pea->flags = 0;
+#ifndef __OS2__
         if (strnequal(ea_name, "user.", 5)) {
                 pea->name = talloc_strdup(mem_ctx, &ea_name[5]);
         } else {
+#else
+                {
+#endif
                 pea->name = talloc_strdup(mem_ctx, ea_name);
         }
@@ -287 +291 @@
                 fstring dos_ea_name;
 
+#ifndef __OS2__
                 if (strnequal(names[i], "system.", 7)
                     || samba_private_attr_name(names[i]))
+#else
+                if (samba_private_attr_name(names[i]))
+#endif
                         continue;
 
@@ -492 +500 @@
                 fstring unix_ea_name;
 
+#ifdef __OS2__
+                /* All EA's must start with user - except on OS/2 */
+                fstrcpy(unix_ea_name, ea_list->ea.name);
+#else
                 fstrcpy(unix_ea_name, "user."); /* All EA's must start with user. */
                 fstrcat(unix_ea_name, ea_list->ea.name);
+#endif
 
                 canonicalize_ea_name(conn, fsp, fname, unix_ea_name);
@@ -5454 +5467 @@
         }
 
+#ifdef __OS2__
+        /* YD ticket#60, the file is opened, we cannot write to it,
+         * so we can return immediately (see above for more comments).
+         */
+        else {
+#endif
+
         DEBUG(10,("smb_set_file_time: setting utimes to modified values.\n"));
 
@@ -5463 +5483 @@
                 return map_nt_error_from_unix(errno);
         }
+#ifdef __OS2__
+        }
+#endif
 
         notify_fname(conn, NOTIFY_ACTION_MODIFIED, action,