svn commit: samba r23538 - in branches: SAMBA_3_0/source/smbd SAMBA_3_0_26/source/smbd

[vlendec at samba.org]

Author: vlendec
Date: 2007-06-18 12:22:42 +0000 (Mon, 18 Jun 2007)
New Revision: 23538

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=23538

Log:
Fix for wild-card rename: We can't return directly on error, we need to
CloseDir.

Modified:
   branches/SAMBA_3_0/source/smbd/reply.c
   branches/SAMBA_3_0_26/source/smbd/reply.c


Changeset:
Modified: branches/SAMBA_3_0/source/smbd/reply.c
===================================================================
--- branches/SAMBA_3_0/source/smbd/reply.c	2007-06-18 09:25:31 UTC (rev 23537)
+++ branches/SAMBA_3_0/source/smbd/reply.c	2007-06-18 12:22:42 UTC (rev 23538)
@@ -4689,7 +4689,7 @@
 			DEBUG(3,("rename_internals: open_file_ntcreate "
 				 "returned %s rename %s -> %s\n",
 				 nt_errstr(status), directory, newname));
-			return status;
+			break;
 		}
 
 		status = rename_internals_fsp(conn, fsp, destname, attrs,
@@ -4701,7 +4701,7 @@
 			DEBUG(3, ("rename_internals_fsp returned %s for "
 				  "rename %s -> %s\n", nt_errstr(status),
 				  directory, newname));
-			return status;
+			break;
 		}
 
 		count++;

Modified: branches/SAMBA_3_0_26/source/smbd/reply.c
===================================================================
--- branches/SAMBA_3_0_26/source/smbd/reply.c	2007-06-18 09:25:31 UTC (rev 23537)
+++ branches/SAMBA_3_0_26/source/smbd/reply.c	2007-06-18 12:22:42 UTC (rev 23538)
@@ -4687,7 +4687,7 @@
 			DEBUG(3,("rename_internals: open_file_ntcreate "
 				 "returned %s rename %s -> %s\n",
 				 nt_errstr(status), directory, newname));
-			return status;
+			break;
 		}
 
 		status = rename_internals_fsp(conn, fsp, destname, attrs,
@@ -4699,7 +4699,7 @@
 			DEBUG(3, ("rename_internals_fsp returned %s for "
 				  "rename %s -> %s\n", nt_errstr(status),
 				  directory, newname));
-			return status;
+			break;
 		}
 
 		count++;