summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2008-10-18 19:41:12 +0200
committerVolker Lendecke <vl@samba.org>2008-10-19 11:36:32 +0200
commitded09b28dea16ba1f4c8894e33a1ce46153e65a7 (patch)
treedcccafc9ad252f548d58693fc04a2f0ff93aa866 /source3
parent7af7935d0ed247faa30ce38723831151ead3c862 (diff)
downloadsamba-ded09b28dea16ba1f4c8894e33a1ce46153e65a7.tar.gz
samba-ded09b28dea16ba1f4c8894e33a1ce46153e65a7.tar.bz2
samba-ded09b28dea16ba1f4c8894e33a1ce46153e65a7.zip
Inline the once-used macro "init_dfsroot"
Diffstat (limited to 'source3')
-rw-r--r--source3/include/msdfs.h8
-rw-r--r--source3/smbd/reply.c7
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));
+ }
}