r5707: BUG 2425: remove ubran legend wrt to win98 and the DFS_PATHNAMES capability bit

(This used to be commit 6511bfe84a4036e0d203858aa2f604e346c9412b)

diff --git a/source3/include/msdfs.h b/source3/include/msdfs.h
index eaefa81c5b83b03c26ac7a8105fa83a883821aea..8b365d02ea6d27d8594859a9c0366d34309c18eb 100644 (file)
--- a/source3/include/msdfs.h
+++ b/source3/include/msdfs.h
@@ -72,14 +72,6 @@ struct dfs_path
              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",                         \

diff --git a/source3/smbd/trans2.c b/source3/smbd/trans2.c
index d493d37b731755904c3bd7fa6404b08d92f7584a..cb9b7db47272586e9f8cb3d17f4edbfe838782e3 100644 (file)
--- a/source3/smbd/trans2.c
+++ b/source3/smbd/trans2.c
@@ -1378,7 +1378,7 @@ close_if_end = %d requires_resume_key = %d level = 0x%x, max_data_bytes = %d\n",
                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) {