- enable MSDFS by default, there seems no reason not to have it enabled

  by default in Samba 3.x

- got rid of some unused parameters in Makefile.in

- declare DEBUGLEVEL in debug.h rather than in each file
(This used to be commit b8651acb9c0d7248a6a2e82c33b1e43633fd83fd)

4 files changed, 0 insertions, 17 deletions

diff --git a/source3/rpc_server/srv_dfs.c b/source3/rpc_server/srv_dfs.c
index fe797e84f6..e2a78782f3 100644
--- a/source3/rpc_server/srv_dfs.c
+++ b/source3/rpc_server/srv_dfs.c
@@ -32,8 +32,6 @@
 extern int DEBUGLEVEL;
 extern pstring global_myname;
 
-#ifdef WITH_MSDFS
-
 /**********************************************************************
  api_dfs_exist
  **********************************************************************/
@@ -179,8 +177,3 @@ BOOL api_netdfs_rpc(pipes_struct *p)
 	return api_rpcTNP(p, "api_netdfs_rpc", api_netdfs_cmds);
 }
 
-#else
-
- void dfs_dummy(void) {;} /* So some compilers don't complain. */
-
-#endif
diff --git a/source3/rpc_server/srv_dfs_nt.c b/source3/rpc_server/srv_dfs_nt.c
index ce8d353274..58e678f0c4 100644
--- a/source3/rpc_server/srv_dfs_nt.c
+++ b/source3/rpc_server/srv_dfs_nt.c
@@ -30,8 +30,6 @@
 extern int DEBUGLEVEL;
 extern pstring global_myname;
 
-#ifdef WITH_MSDFS
-
 #define MAX_MSDFS_JUNCTIONS 256
 
 /* This function does not return a WERROR or NTSTATUS code but rather 1 if
@@ -368,6 +366,3 @@ WERROR _dfs_get_info(pipes_struct *p, DFS_Q_DFS_GET_INFO *q_u,
   
   return r_u->status;
 }
-#else
-	void dfs_dummy1(void) {;} /* So some compilers don't complain. */
-#endif
diff --git a/source3/rpc_server/srv_pipe.c b/source3/rpc_server/srv_pipe.c
index 60250c903f..3570969efc 100644
--- a/source3/rpc_server/srv_pipe.c
+++ b/source3/rpc_server/srv_pipe.c
@@ -493,9 +493,7 @@ static struct api_cmd api_fd_commands[] =
     { "NETLOGON", "lsass",   api_netlog_rpc },
     { "winreg",   "winreg",  api_reg_rpc },
     { "spoolss",  "spoolss", api_spoolss_rpc },
-#ifdef WITH_MSDFS
     { "netdfs",   "netdfs" , api_netdfs_rpc },
-#endif
     { NULL,       NULL,      NULL }
 };
 
diff --git a/source3/rpc_server/srv_srvsvc_nt.c b/source3/rpc_server/srv_srvsvc_nt.c
index a0ae9050e2..0db06754f4 100644
--- a/source3/rpc_server/srv_srvsvc_nt.c
+++ b/source3/rpc_server/srv_srvsvc_nt.c
@@ -409,11 +409,8 @@ static void init_srv_share_info_1005(SRV_SHARE_INFO_1005* sh1005, int snum)
 {
 	sh1005->dfs_root_flag = 0;
 
-#ifdef WITH_MSDFS
 	if(lp_host_msdfs() && lp_msdfs_root(snum))
 		sh1005->dfs_root_flag = 3;
-#endif
-
 }
 
 /*******************************************************************