diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-10-19 14:27:08 +0200 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-10-19 14:27:08 +0200 |
| commit | e09c0c1185b4a4ad1d28023549074875028f3e55 (patch) | |
| tree | 158cd066a2dd19169748a6d94fc990953d49b6c9 /source3/smbd | |
| parent | 33032d591f8e39edae0ce4b35ca1b6e25f04a04b (diff) | |
| parent | 085e7b0b6cc882b31c11b6d6ea7834235588e1ed (diff) | |
| download | samba-e09c0c1185b4a4ad1d28023549074875028f3e55.tar.gz samba-e09c0c1185b4a4ad1d28023549074875028f3e55.tar.bz2 samba-e09c0c1185b4a4ad1d28023549074875028f3e55.zip | |
Merge branch 'master' of ssh://git.samba.org/data/git/samba into crypt
Diffstat (limited to 'source3/smbd')
| -rw-r--r-- | source3/smbd/reply.c | 7 | ||||
| -rw-r--r-- | source3/smbd/server.c | 2 |
2 files changed, 7 insertions, 2 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)); + } } diff --git a/source3/smbd/server.c b/source3/smbd/server.c index f64ba8c05f..4e81263ee4 100644 --- a/source3/smbd/server.c +++ b/source3/smbd/server.c @@ -888,7 +888,7 @@ bool reload_services(bool test) enum server_exit_reason { SERVER_EXIT_NORMAL, SERVER_EXIT_ABNORMAL }; static void exit_server_common(enum server_exit_reason how, - const char *const reason) NORETURN_ATTRIBUTE; + const char *const reason) _NORETURN_; static void exit_server_common(enum server_exit_reason how, const char *const reason) |