Merge branch 'master' of ssh://git.samba.org/data/git/samba
authorJelmer Vernooij <jelmer@samba.org>
Sun, 19 Oct 2008 09:53:44 +0000 (11:53 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Sun, 19 Oct 2008 09:53:44 +0000 (11:53 +0200)
source3/include/msdfs.h
source3/smbd/reply.c

index 4551325843042b5d03b3c3cb9ef44c349108ce82..800393c75ddb49fec66947c24ade9c4177cfa857 100644 (file)
@@ -64,12 +64,4 @@ struct dfs_path {
        bool posix_path;
 };
 
-#define init_dfsroot(conn, inbuf, outbuf)                      \
-{ if (lp_msdfs_root(SNUM(conn)) && lp_host_msdfs()) {          \
-        DEBUG(2,("Serving %s as a Dfs root\n",                         \
-                lp_servicename(SNUM(conn)) ));                 \
-       SSVAL(outbuf, smb_vwv2, SMB_SHARE_IN_DFS                \
-             | SVAL(outbuf, smb_vwv2));                        \
-} }
-
 #endif /* _MSDFS_H */
index 9ccfaa7bcbfda94e505576e7795a0024d74e948a..b7763cb1cf98cee915187445c98b1bbbfe3ec2e6 100644 (file)
@@ -747,7 +747,12 @@ void reply_tcon_and_X(struct smb_request *req)
                SSVAL(req->outbuf, smb_vwv2, SMB_SUPPORT_SEARCH_BITS|
                      (lp_csc_policy(SNUM(conn)) << 2));
 
-               init_dfsroot(conn, req->inbuf, req->outbuf);
+               if (lp_msdfs_root(SNUM(conn)) && lp_host_msdfs()) {
+                       DEBUG(2,("Serving %s as a Dfs root\n",
+                                lp_servicename(SNUM(conn)) ));
+                       SSVAL(req->outbuf, smb_vwv2,
+                             SMB_SHARE_IN_DFS | SVAL(req->outbuf, smb_vwv2));
+               }
        }