svn commit: samba r5707 - in branches/SAMBA_3_0/source: include smbd

[jerry at samba.org]

Author: jerry
Date: 2005-03-09 15:13:23 +0000 (Wed, 09 Mar 2005)
New Revision: 5707

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

Log:
BUG 2425: remove ubran legend wrt to win98 and the DFS_PATHNAMES capability bit
Modified:
   branches/SAMBA_3_0/source/include/msdfs.h
   branches/SAMBA_3_0/source/smbd/trans2.c


Changeset:
Modified: branches/SAMBA_3_0/source/include/msdfs.h
===================================================================
--- branches/SAMBA_3_0/source/include/msdfs.h	2005-03-09 10:41:24 UTC (rev 5706)
+++ branches/SAMBA_3_0/source/include/msdfs.h	2005-03-09 15:13:23 UTC (rev 5707)
@@ -72,14 +72,6 @@
              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) ||      		\
-       ((get_remote_arch() == RA_WIN95) && lp_msdfs_root(SNUM(conn))) )	\
-	 if (lp_host_msdfs() && 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/source/smbd/trans2.c
===================================================================
--- branches/SAMBA_3_0/source/smbd/trans2.c	2005-03-09 10:41:24 UTC (rev 5706)
+++ branches/SAMBA_3_0/source/smbd/trans2.c	2005-03-09 15:13:23 UTC (rev 5707)
@@ -1378,7 +1378,7 @@
 		return ERROR_NT(ntstatus);
 	}
 
-	RESOLVE_FINDFIRST_DFSPATH(directory, conn, inbuf, outbuf);
+	RESOLVE_DFSPATH(directory, conn, inbuf, outbuf);
 
 	unix_convert(directory,conn,0,&bad_path,&sbuf);
 	if (bad_path) {