summaryrefslogtreecommitdiff
path: root/source3/smbd
diff options
context:
space:
mode:
Diffstat (limited to 'source3/smbd')
-rw-r--r--source3/smbd/server.c4
-rw-r--r--source3/smbd/trans2.c9
2 files changed, 6 insertions, 7 deletions
diff --git a/source3/smbd/server.c b/source3/smbd/server.c
index d0b909609f..401c236374 100644
--- a/source3/smbd/server.c
+++ b/source3/smbd/server.c
@@ -301,11 +301,13 @@ BOOL reload_services(BOOL test)
ret = lp_load(servicesf,False,False,True);
+#ifdef MS_DFS
/* load the dfs maps of all the services having
a dfs_map parameter
we don't want to do this in lp_load because we want just the smbd
- server to load up the dfs maps into msdfds.tdb. not nmbd, swat etc*/
+ server to load up the dfs maps into msdfs.tdb. not nmbd, swat etc*/
load_dfsmaps();
+#endif
load_printers();
diff --git a/source3/smbd/trans2.c b/source3/smbd/trans2.c
index 3135079514..e3dbc91e50 100644
--- a/source3/smbd/trans2.c
+++ b/source3/smbd/trans2.c
@@ -2138,12 +2138,11 @@ static int call_trans2getdfsreferral(connection_struct *conn, char* inbuf,
BOOL NT_arch = ((ra_type == RA_WINNT) || (ra_type == RA_WIN2K));
pstring pathname;
int reply_size = 0;
- char* dfs_referral = NULL;
int max_referral_level = SVAL(params,0);
#endif
DEBUG(10,("call_trans2getdfsreferral\n"));
-#ifdef MS_DFS
+
if(!lp_host_msdfs())
return(ERROR(ERRDOS,ERRbadfunc));
@@ -2163,10 +2162,8 @@ static int call_trans2getdfsreferral(connection_struct *conn, char* inbuf,
SSVAL(outbuf,smb_flg2,SVAL(outbuf,smb_flg2) | FLAGS2_UNICODE_STRINGS |
FLAGS2_DFS_PATHNAMES);
send_trans2_replies(outbuf,bufsize,0,0,*ppdata,reply_size);
-#else
- DEBUG(0,("Unexpected DFS referral request!\n"));
- return(ERROR(ERRDOS,ERRbadfunc));
-#endif
+
+ return(-1);
}