diff options
| -rwxr-xr-x | source3/configure.developer | 3 | ||||
| -rw-r--r-- | source3/msdfs/msdfs_tdb.c | 2 | ||||
| -rw-r--r-- | source3/param/loadparm.c | 4 | ||||
| -rw-r--r-- | source3/smbd/server.c | 4 | ||||
| -rw-r--r-- | source3/smbd/trans2.c | 9 |
5 files changed, 9 insertions, 13 deletions
diff --git a/source3/configure.developer b/source3/configure.developer index 6cc442b1ac..e7c8831f62 100755 --- a/source3/configure.developer +++ b/source3/configure.developer @@ -1,3 +1,4 @@ #!/bin/sh -export CFLAGS="-g -Wall -Wshadow -Wstrict-prototypes -Wpointer-arith -Wcast-qual -Wcast-align -DDEBUG_PASSWORD" +CFLAGS="-g -Wall -Wshadow -Wstrict-prototypes -Wpointer-arith -Wcast-qual -Wcast-align -DDEBUG_PASSWORD" +export CFLAGS ./configure $* diff --git a/source3/msdfs/msdfs_tdb.c b/source3/msdfs/msdfs_tdb.c index 9ea5fe6641..2435d7ade7 100644 --- a/source3/msdfs/msdfs_tdb.c +++ b/source3/msdfs/msdfs_tdb.c @@ -252,7 +252,7 @@ void msdfs_close(void) void msdfs_end(void) { - pstring fname; + /* pstring fname; */ msdfs_close(); /* pstrcpy(fname,lock_path(MSDFS_TDB)); diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c index 7f7132b5b7..a9c7f29ea1 100644 --- a/source3/param/loadparm.c +++ b/source3/param/loadparm.c @@ -251,9 +251,7 @@ typedef struct BOOL bDebugHiresTimestamp; BOOL bDebugPid; BOOL bDebugUid; -#ifdef MS_DFS BOOL bHostMSDfs; -#endif } global; static global Globals; @@ -1315,9 +1313,7 @@ FN_GLOBAL_BOOL(lp_nt_acl_support,&Globals.bNTAclSupport) FN_GLOBAL_BOOL(lp_stat_cache,&Globals.bStatCache) FN_GLOBAL_BOOL(lp_allow_trusted_domains,&Globals.bAllowTrustedDomains) FN_GLOBAL_BOOL(lp_restrict_anonymous,&Globals.bRestrictAnonymous) -#ifdef MS_DFS FN_GLOBAL_BOOL(lp_host_msdfs,&Globals.bHostMSDfs) -#endif FN_GLOBAL_INTEGER(lp_os_level,&Globals.os_level) FN_GLOBAL_INTEGER(lp_max_ttl,&Globals.max_ttl) FN_GLOBAL_INTEGER(lp_max_wins_ttl,&Globals.max_wins_ttl) 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); } |