svn commit: samba r24497 - in branches: SAMBA_3_2/source/smbd SAMBA_3_2_0/source/smbd

[vlendec at samba.org]

Author: vlendec
Date: 2007-08-16 15:44:13 +0000 (Thu, 16 Aug 2007)
New Revision: 24497

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

Log:
Revert r24485 -- this needs more thought
Modified:
   branches/SAMBA_3_2/source/smbd/filename.c
   branches/SAMBA_3_2_0/source/smbd/filename.c


Changeset:
Modified: branches/SAMBA_3_2/source/smbd/filename.c
===================================================================
--- branches/SAMBA_3_2/source/smbd/filename.c	2007-08-16 15:32:00 UTC (rev 24496)
+++ branches/SAMBA_3_2/source/smbd/filename.c	2007-08-16 15:44:13 UTC (rev 24497)
@@ -603,8 +603,8 @@
 
  done:
 	result = NT_STATUS_OK;
+	pstrcpy(orig_path, name);
  fail:
-	pstrcpy(orig_path, name);
 	SAFE_FREE(name);
 	SAFE_FREE(dirpath);
 	return result;

Modified: branches/SAMBA_3_2_0/source/smbd/filename.c
===================================================================
--- branches/SAMBA_3_2_0/source/smbd/filename.c	2007-08-16 15:32:00 UTC (rev 24496)
+++ branches/SAMBA_3_2_0/source/smbd/filename.c	2007-08-16 15:44:13 UTC (rev 24497)
@@ -603,8 +603,8 @@
 
  done:
 	result = NT_STATUS_OK;
+	pstrcpy(orig_path, name);
  fail:
-	pstrcpy(orig_path, name);
 	SAFE_FREE(name);
 	SAFE_FREE(dirpath);
 	return result;