summaryrefslogtreecommitdiff
path: root/source3/smbd
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2008-10-19 12:39:37 +0200
committerJelmer Vernooij <jelmer@samba.org>2008-10-19 12:39:37 +0200
commit9fec173b071d0e4c17db73823bd7c1bdd50ad4d1 (patch)
tree1d5ec16ec4230c9eeacbf4dafa49ceee041e7fe6 /source3/smbd
parent8e704e4107b284bfc1e43f4c698ac0e6c5ae1800 (diff)
parent58b4efc9b49c1cc366303a306639a3fc9321dcfe (diff)
downloadsamba-9fec173b071d0e4c17db73823bd7c1bdd50ad4d1.tar.gz
samba-9fec173b071d0e4c17db73823bd7c1bdd50ad4d1.tar.bz2
samba-9fec173b071d0e4c17db73823bd7c1bdd50ad4d1.zip
Merge branch 'master' of ssh://git.samba.org/data/git/samba into strhex
Diffstat (limited to 'source3/smbd')
-rw-r--r--source3/smbd/reply.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c
index 9ccfaa7bcb..b7763cb1cf 100644
--- a/source3/smbd/reply.c
+++ b/source3/smbd/reply.c
@@ -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));
+ }
}