From d817eaf0ecca2d878ab1ffcf7a747a02d71c811e Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Sat, 10 May 2003 11:49:51 +0000 Subject: [PATCH] Reverse previous patch from Stefan and me after comments by Andrew Bartlett --- source/client/client.c | 2 -- source/client/smbmount.c | 2 -- source/client/smbspool.c | 2 -- source/nmbd/nmbd.c | 2 -- source/nsswitch/winbindd.c | 2 -- source/passdb/pdb_interface.c | 4 ++-- source/rpcclient/rpcclient.c | 4 ---- source/smbd/server.c | 7 ------- source/torture/locktest.c | 2 -- source/torture/locktest2.c | 2 -- source/torture/masktest.c | 2 -- source/torture/msgtest.c | 2 -- source/torture/nsstest.c | 2 -- source/torture/rpctorture.c | 2 -- source/torture/smbiconv.c | 2 -- source/torture/torture.c | 2 -- source/torture/vfstest.c | 6 ------ source/utils/net.c | 4 ---- source/utils/nmblookup.c | 2 -- source/utils/ntlm_auth.c | 2 -- source/utils/pdbedit.c | 3 --- source/utils/profiles.c | 2 -- source/utils/rpccheck.c | 2 -- source/utils/smbcacls.c | 2 -- source/utils/smbcontrol.c | 2 -- source/utils/smbcquotas.c | 2 -- source/utils/smbfilter.c | 2 -- source/utils/smbpasswd.c | 3 --- source/utils/smbtree.c | 2 -- source/utils/status.c | 2 -- source/utils/testparm.c | 2 -- source/utils/testprns.c | 2 -- source/web/swat.c | 3 --- source/wrepld/server.c | 2 -- 34 files changed, 2 insertions(+), 84 deletions(-) diff --git a/source/client/client.c b/source/client/client.c index c8d2ca7b04f..36c76cbf15d 100644 --- a/source/client/client.c +++ b/source/client/client.c @@ -28,8 +28,6 @@ #define REGISTER 0 #endif -#include "module_dummy.h" - struct cli_state *cli; extern BOOL in_client; static int port = 0; diff --git a/source/client/smbmount.c b/source/client/smbmount.c index eeaec642040..1ee7dbc8cb9 100644 --- a/source/client/smbmount.c +++ b/source/client/smbmount.c @@ -22,8 +22,6 @@ #include "includes.h" -#include "module_dummy.h" - #include #include #include diff --git a/source/client/smbspool.c b/source/client/smbspool.c index eef663ebfd2..68165792da3 100644 --- a/source/client/smbspool.c +++ b/source/client/smbspool.c @@ -24,8 +24,6 @@ #include "includes.h" -#include "module_dummy.h" - /* * Globals... */ diff --git a/source/nmbd/nmbd.c b/source/nmbd/nmbd.c index 411a406a929..d9300f4668f 100644 --- a/source/nmbd/nmbd.c +++ b/source/nmbd/nmbd.c @@ -23,8 +23,6 @@ #include "includes.h" -#include "module_dummy.h" - int ClientNMB = -1; int ClientDGRAM = -1; int global_nmb_port = -1; diff --git a/source/nsswitch/winbindd.c b/source/nsswitch/winbindd.c index 7c59344be2b..fb6f67625c0 100644 --- a/source/nsswitch/winbindd.c +++ b/source/nsswitch/winbindd.c @@ -24,8 +24,6 @@ #include "winbindd.h" -#include "module_dummy.h" - BOOL opt_nocache = False; BOOL opt_dual_daemon = False; diff --git a/source/passdb/pdb_interface.c b/source/passdb/pdb_interface.c index dc2b43d204d..7b44df193fc 100644 --- a/source/passdb/pdb_interface.c +++ b/source/passdb/pdb_interface.c @@ -436,10 +436,10 @@ static NTSTATUS make_pdb_methods_name(struct pdb_methods **methods, struct pdb_c /* Try to find a module that contains this module */ if (!entry) { DEBUG(2,("No builtin backend found, trying to load plugin\n")); - if(NT_STATUS_IS_OK(nt_status = smb_probe_module("pdb", module_name)) && !(entry = pdb_find_backend_entry(module_name))) { + if(NT_STATUS_IS_OK(smb_probe_module("pdb", module_name)) && !(entry = pdb_find_backend_entry(module_name))) { DEBUG(0,("Plugin is available, but doesn't register passdb backend %s\n", module_name)); SAFE_FREE(module_name); - return nt_status; + return NT_STATUS_UNSUCCESSFUL; } } diff --git a/source/rpcclient/rpcclient.c b/source/rpcclient/rpcclient.c index fb0845e615b..a1b0a8cd345 100644 --- a/source/rpcclient/rpcclient.c +++ b/source/rpcclient/rpcclient.c @@ -23,10 +23,6 @@ #include "includes.h" #include "rpcclient.h" - -#define HAVE_SMB_REGISTER_PASSDB -#include "module_dummy.h" - DOM_SID domain_sid; diff --git a/source/smbd/server.c b/source/smbd/server.c index e933c4d3d45..d46be42eba6 100644 --- a/source/smbd/server.c +++ b/source/smbd/server.c @@ -22,13 +22,6 @@ #include "includes.h" -#define HAVE_SMB_REGISTER_AUTH -#define HAVE_SMB_REGISTER_PASSDB -#define HAVE_RPC_PIPE_REGISTER_COMMANDS -#define HAVE_SMB_REGISTER_VFS -#include "module_dummy.h" - - int am_parent = 1; /* the last message the was processed */ diff --git a/source/torture/locktest.c b/source/torture/locktest.c index c18d2c100bc..63b9590dd61 100644 --- a/source/torture/locktest.c +++ b/source/torture/locktest.c @@ -22,8 +22,6 @@ #include "includes.h" -#include "module_dummy.h" - static fstring password[2]; static fstring username[2]; static int got_user; diff --git a/source/torture/locktest2.c b/source/torture/locktest2.c index 596596eb8a8..97844b5609e 100644 --- a/source/torture/locktest2.c +++ b/source/torture/locktest2.c @@ -22,8 +22,6 @@ #include "includes.h" -#include "module_dummy.h" - static fstring password; static fstring username; static int got_pass; diff --git a/source/torture/masktest.c b/source/torture/masktest.c index a4da1baff27..06dead3f16f 100644 --- a/source/torture/masktest.c +++ b/source/torture/masktest.c @@ -22,8 +22,6 @@ #include "includes.h" -#include "module_dummy.h" - static fstring password; static fstring username; static int got_pass; diff --git a/source/torture/msgtest.c b/source/torture/msgtest.c index 091b6337ab1..8abb0a20d2e 100644 --- a/source/torture/msgtest.c +++ b/source/torture/msgtest.c @@ -25,8 +25,6 @@ #include "includes.h" -#include "module_dummy.h" - static int pong_count; /**************************************************************************** diff --git a/source/torture/nsstest.c b/source/torture/nsstest.c index 27b77e2a83b..a82fa05203e 100644 --- a/source/torture/nsstest.c +++ b/source/torture/nsstest.c @@ -20,8 +20,6 @@ #include "includes.h" -#include "module_dummy.h" - static const char *so_path = "/lib/libnss_winbind.so"; static const char *nss_name = "winbind"; static int nss_errno; diff --git a/source/torture/rpctorture.c b/source/torture/rpctorture.c index e88a39a4839..086f8d5d331 100644 --- a/source/torture/rpctorture.c +++ b/source/torture/rpctorture.c @@ -20,8 +20,6 @@ #include "includes.h" -#include "module_dummy.h" - #ifndef REGISTER #define REGISTER 0 #endif diff --git a/source/torture/smbiconv.c b/source/torture/smbiconv.c index 613082225a2..ce21a09025e 100644 --- a/source/torture/smbiconv.c +++ b/source/torture/smbiconv.c @@ -23,8 +23,6 @@ #include "includes.h" -#include "module_dummy.h" - static int process_block (smb_iconv_t cd, char *addr, size_t len, FILE *output) { diff --git a/source/torture/torture.c b/source/torture/torture.c index 4141b29cc20..07d7f1547ed 100644 --- a/source/torture/torture.c +++ b/source/torture/torture.c @@ -22,8 +22,6 @@ #include "includes.h" -#include "module_dummy.h" - static fstring host, workgroup, share, password, username, myname; static int max_protocol = PROTOCOL_NT1; static const char *sockops="TCP_NODELAY"; diff --git a/source/torture/vfstest.c b/source/torture/vfstest.c index d6b84126a0b..3b28a3c496b 100644 --- a/source/torture/vfstest.c +++ b/source/torture/vfstest.c @@ -27,12 +27,6 @@ #include "includes.h" #include "vfstest.h" -#define HAVE_SMB_REGISTER_AUTH -#define HAVE_SMB_REGISTER_PASSDB -#define HAVE_RPC_PIPE_REGISTER_COMMANDS -#define HAVE_SMB_REGISTER_VFS -#include "module_dummy.h" - /* List to hold groups of commands */ static struct cmd_list { struct cmd_list *prev, *next; diff --git a/source/utils/net.c b/source/utils/net.c index b2a86bb0201..aa245a920a7 100644 --- a/source/utils/net.c +++ b/source/utils/net.c @@ -40,10 +40,6 @@ #include "includes.h" #include "../utils/net.h" -#define HAVE_SMB_REGISTER_PASSDB -#include "module_dummy.h" - - /***********************************************************************/ /* Beginning of internationalization section. Translatable constants */ /* should be kept in this area and referenced in the rest of the code. */ diff --git a/source/utils/nmblookup.c b/source/utils/nmblookup.c index 7083961ccb5..d2c5cbc00ed 100644 --- a/source/utils/nmblookup.c +++ b/source/utils/nmblookup.c @@ -24,8 +24,6 @@ #include "includes.h" -#include "module_dummy.h" - extern BOOL AllowDebugChange; static BOOL give_flags = False; diff --git a/source/utils/ntlm_auth.c b/source/utils/ntlm_auth.c index 0d63afda72c..a713f3aa2dd 100644 --- a/source/utils/ntlm_auth.c +++ b/source/utils/ntlm_auth.c @@ -27,8 +27,6 @@ #undef DBGC_CLASS #define DBGC_CLASS DBGC_WINBIND -#include "module_dummy.h" - #define SQUID_BUFFER_SIZE 2010 enum squid_mode { diff --git a/source/utils/pdbedit.c b/source/utils/pdbedit.c index 5116855e71b..3a3d06a6452 100644 --- a/source/utils/pdbedit.c +++ b/source/utils/pdbedit.c @@ -23,9 +23,6 @@ #include "includes.h" -#define HAVE_SMB_REGISTER_PASSDB -#include "module_dummy.h" - #define BIT_BACKEND 0x00000004 #define BIT_VERBOSE 0x00000008 #define BIT_SPSTYLE 0x00000010 diff --git a/source/utils/profiles.c b/source/utils/profiles.c index 8abdfd6f77e..7c2d820c810 100644 --- a/source/utils/profiles.c +++ b/source/utils/profiles.c @@ -297,8 +297,6 @@ Hope this helps.... (Although it was "fun" for me to uncover this things, #include #include -#include "module_dummy.h" - typedef unsigned int DWORD; typedef unsigned short WORD; diff --git a/source/utils/rpccheck.c b/source/utils/rpccheck.c index 11a2a9d8baa..ae109f69b65 100644 --- a/source/utils/rpccheck.c +++ b/source/utils/rpccheck.c @@ -20,8 +20,6 @@ #include "includes.h" -#include "module_dummy.h" - main() { char filter[]="0123456789ABCDEF"; diff --git a/source/utils/smbcacls.c b/source/utils/smbcacls.c index 35a9b05dcd7..9d8a6577263 100644 --- a/source/utils/smbcacls.c +++ b/source/utils/smbcacls.c @@ -24,8 +24,6 @@ #include "includes.h" -#include "module_dummy.h" - static pstring owner_username; static fstring server; static int test_args = False; diff --git a/source/utils/smbcontrol.c b/source/utils/smbcontrol.c index 0c68bfc329a..06add6af228 100644 --- a/source/utils/smbcontrol.c +++ b/source/utils/smbcontrol.c @@ -25,8 +25,6 @@ #include "includes.h" -#include "module_dummy.h" - /* Default timeout value when waiting for replies (in seconds) */ #define DEFAULT_TIMEOUT 10 diff --git a/source/utils/smbcquotas.c b/source/utils/smbcquotas.c index 9ba243a4a58..9c7379ca2a9 100644 --- a/source/utils/smbcquotas.c +++ b/source/utils/smbcquotas.c @@ -24,8 +24,6 @@ #include "includes.h" -#include "module_dummy.h" - static pstring server; /* numeric is set when the user wants numeric SIDs and ACEs rather diff --git a/source/utils/smbfilter.c b/source/utils/smbfilter.c index fe5208227d7..1a0d639f025 100644 --- a/source/utils/smbfilter.c +++ b/source/utils/smbfilter.c @@ -20,8 +20,6 @@ #include "includes.h" -#include "module_dummy.h" - #define SECURITY_MASK 0 #define SECURITY_SET 0 diff --git a/source/utils/smbpasswd.c b/source/utils/smbpasswd.c index 2070adb3e56..577e467fbdb 100644 --- a/source/utils/smbpasswd.c +++ b/source/utils/smbpasswd.c @@ -19,9 +19,6 @@ #include "includes.h" -#define HAVE_SMB_REGISTER_PASSDB -#include "module_dummy.h" - extern BOOL AllowDebugChange; /* diff --git a/source/utils/smbtree.c b/source/utils/smbtree.c index bc669b4aa16..cbe1bd448f8 100644 --- a/source/utils/smbtree.c +++ b/source/utils/smbtree.c @@ -22,8 +22,6 @@ #include "includes.h" -#include "module_dummy.h" - static BOOL use_bcast; /* How low can we go? */ diff --git a/source/utils/status.c b/source/utils/status.c index fab55baabbb..bbaeecdd6bb 100644 --- a/source/utils/status.c +++ b/source/utils/status.c @@ -35,8 +35,6 @@ #include "includes.h" -#include "module_dummy.h" - static pstring Ucrit_username = ""; /* added by OH */ static pid_t Ucrit_pid[100]; /* Ugly !!! */ /* added by OH */ static int Ucrit_MaxPid=0; /* added by OH */ diff --git a/source/utils/testparm.c b/source/utils/testparm.c index b3e8f8badbf..e3d6ce02748 100644 --- a/source/utils/testparm.c +++ b/source/utils/testparm.c @@ -34,8 +34,6 @@ #include "includes.h" -#include "module_dummy.h" - extern BOOL AllowDebugChange; /*********************************************** diff --git a/source/utils/testprns.c b/source/utils/testprns.c index 758e2b41dd6..7e52b86afb6 100644 --- a/source/utils/testprns.c +++ b/source/utils/testprns.c @@ -32,8 +32,6 @@ #include "includes.h" -#include "module_dummy.h" - int main(int argc, char *argv[]) { const char *pszTemp; diff --git a/source/web/swat.c b/source/web/swat.c index e93fb2e5e12..7f9492933a5 100644 --- a/source/web/swat.c +++ b/source/web/swat.c @@ -31,9 +31,6 @@ #include "includes.h" #include "../web/swat_proto.h" -#define HAVE_SMB_REGISTER_PASSDB -#include "module_dummy.h" - #define GLOBALS_SNUM -1 static BOOL demo_mode = False; diff --git a/source/wrepld/server.c b/source/wrepld/server.c index 21bc2e4925b..504818b8d52 100644 --- a/source/wrepld/server.c +++ b/source/wrepld/server.c @@ -21,8 +21,6 @@ #include "includes.h" #include "wins_repl.h" -#include "module_dummy.h" - extern pstring user_socket_options; extern WINS_OWNER *global_wins_table;