[SCM] Samba Shared Repository - branch master updated - ded09b28dea16ba1f4c8894e33a1ce46153e65a7

[Volker Lendecke]

The branch, master has been updated
       via  ded09b28dea16ba1f4c8894e33a1ce46153e65a7 (commit)
      from  7af7935d0ed247faa30ce38723831151ead3c862 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit ded09b28dea16ba1f4c8894e33a1ce46153e65a7
Author: Volker Lendecke <vl at samba.org>
Date:   Sat Oct 18 19:41:12 2008 +0200

    Inline the once-used macro "init_dfsroot"

-----------------------------------------------------------------------

Summary of changes:
 source3/include/msdfs.h |    8 --------
 source3/smbd/reply.c    |    7 ++++++-
 2 files changed, 6 insertions(+), 9 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/include/msdfs.h b/source3/include/msdfs.h
index 4551325..800393c 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 9ccfaa7..b7763cb 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));
+		}
 	}
 
 


-- 
Samba Shared Repository