svn commit: samba r6285 - in branches/SAMBA_3_0_RELEASE/source: include smbd

[jerry at samba.org]

Author: jerry
Date: 2005-04-10 22:19:36 +0000 (Sun, 10 Apr 2005)
New Revision: 6285

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

Log:
revert -r5707 to fix the XP sp2 dfs issue in FindFirst().
This is not the same fix as in the current SAMBA_3_0 svn tree
since that code has morphed quite a lot.  But the effect is the same.


Modified:
   branches/SAMBA_3_0_RELEASE/source/include/msdfs.h
   branches/SAMBA_3_0_RELEASE/source/smbd/trans2.c


Changeset:
Modified: branches/SAMBA_3_0_RELEASE/source/include/msdfs.h
===================================================================
--- branches/SAMBA_3_0_RELEASE/source/include/msdfs.h	2005-04-10 22:10:05 UTC (rev 6284)
+++ branches/SAMBA_3_0_RELEASE/source/include/msdfs.h	2005-04-10 22:19:36 UTC (rev 6285)
@@ -72,6 +72,14 @@
              return ERROR_BOTH(NT_STATUS_PATH_NOT_COVERED,	\
 			       ERRSRV, ERRbadpath);; }		
 
+#define RESOLVE_FINDFIRST_DFSPATH(name, conn, inbuf, outbuf) 		\
+{ if ((SVAL(inbuf,smb_flg2) & FLAGS2_DFS_PATHNAMES) &&       	\
+      lp_host_msdfs() && lp_msdfs_root(SNUM(conn)) &&		\
+      dfs_redirect(name,conn,True))				\
+             return ERROR_BOTH(NT_STATUS_PATH_NOT_COVERED,	\
+			       ERRSRV, ERRbadpath);; }		
+
+ 
 #define init_dfsroot(conn, inbuf, outbuf)                    	\
 { if (lp_msdfs_root(SNUM(conn)) && lp_host_msdfs()) {        	\
         DEBUG(2,("Serving %s as a Dfs root\n", 			\

Modified: branches/SAMBA_3_0_RELEASE/source/smbd/trans2.c
===================================================================
--- branches/SAMBA_3_0_RELEASE/source/smbd/trans2.c	2005-04-10 22:10:05 UTC (rev 6284)
+++ branches/SAMBA_3_0_RELEASE/source/smbd/trans2.c	2005-04-10 22:19:36 UTC (rev 6285)
@@ -1378,7 +1378,7 @@
 		return ERROR_NT(ntstatus);
 	}
 
-	RESOLVE_DFSPATH(directory, conn, inbuf, outbuf);
+	RESOLVE_FINDFIRST_DFSPATH(directory, conn, inbuf, outbuf);
 
 	unix_convert(directory,conn,0,&bad_path,&sbuf);
 	if (bad_path) {