diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-10-19 11:53:44 +0200 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-10-19 11:53:44 +0200 |
| commit | 58b4efc9b49c1cc366303a306639a3fc9321dcfe (patch) | |
| tree | b6ed82be41a26ec99d5dae430698bd04c0c9139c | |
| parent | 452b3e57e9b78dbc2f80d24112540e69fbf13954 (diff) | |
| parent | ded09b28dea16ba1f4c8894e33a1ce46153e65a7 (diff) | |
| download | samba-58b4efc9b49c1cc366303a306639a3fc9321dcfe.tar.gz samba-58b4efc9b49c1cc366303a306639a3fc9321dcfe.tar.bz2 samba-58b4efc9b49c1cc366303a306639a3fc9321dcfe.zip | |
Merge branch 'master' of ssh://git.samba.org/data/git/samba
| -rw-r--r-- | source3/include/msdfs.h | 8 | ||||
| -rw-r--r-- | source3/smbd/reply.c | 7 |
2 files changed, 6 insertions, 9 deletions
diff --git a/source3/include/msdfs.h b/source3/include/msdfs.h index 4551325843..800393c75d 100644 --- a/source3/include/msdfs.h +++ b/source3/include/msdfs.h @@ -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 */ 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)); + } } |