Changeset 454 for trunk/server/source3/smbd/reply.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/reply.c (modified) (2 diffs)

trunk/server/source3/smbd/reply.c

@@ -5652 +5652 @@
         bool dst_exists, old_is_stream, new_is_stream;
 
+/* borrowed from 3.3 source patch by Apple */
+#ifdef __OS2__
+        bool check_dest_exist = False;
+#else
+        bool check_dest_exist = True;
+#endif
+
         status = check_name(conn, smb_fname_dst_in->base_name);
         if (!NT_STATUS_IS_OK(status)) {
@@ -5789 +5796 @@
         dst_exists = SMB_VFS_STAT(conn, smb_fname_dst) == 0;
 
-        if(!replace_if_exists && dst_exists) {
+        if(check_dest_exist && !replace_if_exists && dst_exists) {
                 DEBUG(3, ("rename_internals_fsp: dest exists doing rename "
                           "%s -> %s\n", smb_fname_str_dbg(fsp->fsp_name),