diff options
34 files changed, 3 insertions, 82 deletions
diff --git a/source3/client/client.c b/source3/client/client.c index 04804ac1f1..b498b5b4a8 100644 --- a/source3/client/client.c +++ b/source3/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/source3/client/smbmount.c b/source3/client/smbmount.c index eeaec64204..1ee7dbc8cb 100644 --- a/source3/client/smbmount.c +++ b/source3/client/smbmount.c @@ -22,8 +22,6 @@ #include "includes.h" -#include "module_dummy.h" - #include <mntent.h> #include <asm/types.h> #include <linux/smb_fs.h> diff --git a/source3/client/smbspool.c b/source3/client/smbspool.c index eef663ebfd..68165792da 100644 --- a/source3/client/smbspool.c +++ b/source3/client/smbspool.c @@ -24,8 +24,6 @@ #include "includes.h" -#include "module_dummy.h" - /* * Globals... */ diff --git a/source3/nmbd/nmbd.c b/source3/nmbd/nmbd.c index 81ef3b79a5..eec447688f 100644 --- a/source3/nmbd/nmbd.c +++ b/source3/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/source3/nsswitch/winbindd.c b/source3/nsswitch/winbindd.c index b65af3d940..018edcb649 100644 --- a/source3/nsswitch/winbindd.c +++ b/source3/nsswitch/winbindd.c @@ -24,6 +24,7 @@ #include "winbindd.h" +#define HAVE_SMB_REGISTER_PASSDB #include "module_dummy.h" BOOL opt_nocache = False; diff --git a/source3/passdb/pdb_interface.c b/source3/passdb/pdb_interface.c index dc2b43d204..7b44df193f 100644 --- a/source3/passdb/pdb_interface.c +++ b/source3/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/source3/rpcclient/rpcclient.c b/source3/rpcclient/rpcclient.c index 68f8fbae8b..b01e2d694c 100644 --- a/source3/rpcclient/rpcclient.c +++ b/source3/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/source3/smbd/server.c b/source3/smbd/server.c index 11f06daf0d..c24fc5134d 100644 --- a/source3/smbd/server.c +++ b/source3/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/source3/torture/locktest.c b/source3/torture/locktest.c index c18d2c100b..63b9590dd6 100644 --- a/source3/torture/locktest.c +++ b/source3/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/source3/torture/locktest2.c b/source3/torture/locktest2.c index 596596eb8a..97844b5609 100644 --- a/source3/torture/locktest2.c +++ b/source3/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/source3/torture/masktest.c b/source3/torture/masktest.c index a4da1baff2..06dead3f16 100644 --- a/source3/torture/masktest.c +++ b/source3/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/source3/torture/msgtest.c b/source3/torture/msgtest.c index 091b6337ab..8abb0a20d2 100644 --- a/source3/torture/msgtest.c +++ b/source3/torture/msgtest.c @@ -25,8 +25,6 @@ #include "includes.h" -#include "module_dummy.h" - static int pong_count; /**************************************************************************** diff --git a/source3/torture/nsstest.c b/source3/torture/nsstest.c index 27b77e2a83..a82fa05203 100644 --- a/source3/torture/nsstest.c +++ b/source3/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/source3/torture/rpctorture.c b/source3/torture/rpctorture.c index e88a39a483..086f8d5d33 100644 --- a/source3/torture/rpctorture.c +++ b/source3/torture/rpctorture.c @@ -20,8 +20,6 @@ #include "includes.h" -#include "module_dummy.h" - #ifndef REGISTER #define REGISTER 0 #endif diff --git a/source3/torture/smbiconv.c b/source3/torture/smbiconv.c index 613082225a..ce21a09025 100644 --- a/source3/torture/smbiconv.c +++ b/source3/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/source3/torture/torture.c b/source3/torture/torture.c index d660b6d003..840b6ad294 100644 --- a/source3/torture/torture.c +++ b/source3/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/source3/torture/vfstest.c b/source3/torture/vfstest.c index d6b84126a0..3b28a3c496 100644 --- a/source3/torture/vfstest.c +++ b/source3/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/source3/utils/net.c b/source3/utils/net.c index b2a86bb020..aa245a920a 100644 --- a/source3/utils/net.c +++ b/source3/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/source3/utils/nmblookup.c b/source3/utils/nmblookup.c index 7083961ccb..d2c5cbc00e 100644 --- a/source3/utils/nmblookup.c +++ b/source3/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/source3/utils/ntlm_auth.c b/source3/utils/ntlm_auth.c index b30efac4b7..42490190f3 100644 --- a/source3/utils/ntlm_auth.c +++ b/source3/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/source3/utils/pdbedit.c b/source3/utils/pdbedit.c index 81d0a61287..13f35e8880 100644 --- a/source3/utils/pdbedit.c +++ b/source3/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/source3/utils/profiles.c b/source3/utils/profiles.c index 4a6fa59b53..afaa83f638 100644 --- a/source3/utils/profiles.c +++ b/source3/utils/profiles.c @@ -297,8 +297,6 @@ Hope this helps.... (Although it was "fun" for me to uncover this things, #include <unistd.h> #include <sys/mman.h> -#include "module_dummy.h" - typedef unsigned int DWORD; typedef unsigned short WORD; diff --git a/source3/utils/rpccheck.c b/source3/utils/rpccheck.c index 11a2a9d8ba..ae109f69b6 100644 --- a/source3/utils/rpccheck.c +++ b/source3/utils/rpccheck.c @@ -20,8 +20,6 @@ #include "includes.h" -#include "module_dummy.h" - main() { char filter[]="0123456789ABCDEF"; diff --git a/source3/utils/smbcacls.c b/source3/utils/smbcacls.c index 35a9b05dcd..9d8a657726 100644 --- a/source3/utils/smbcacls.c +++ b/source3/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/source3/utils/smbcontrol.c b/source3/utils/smbcontrol.c index 0c68bfc329..06add6af22 100644 --- a/source3/utils/smbcontrol.c +++ b/source3/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/source3/utils/smbcquotas.c b/source3/utils/smbcquotas.c index 9ba243a4a5..9c7379ca2a 100644 --- a/source3/utils/smbcquotas.c +++ b/source3/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/source3/utils/smbfilter.c b/source3/utils/smbfilter.c index fe5208227d..1a0d639f02 100644 --- a/source3/utils/smbfilter.c +++ b/source3/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/source3/utils/smbpasswd.c b/source3/utils/smbpasswd.c index 2070adb3e5..577e467fbd 100644 --- a/source3/utils/smbpasswd.c +++ b/source3/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/source3/utils/smbtree.c b/source3/utils/smbtree.c index bc669b4aa1..cbe1bd448f 100644 --- a/source3/utils/smbtree.c +++ b/source3/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/source3/utils/status.c b/source3/utils/status.c index fab55baabb..bbaeecdd6b 100644 --- a/source3/utils/status.c +++ b/source3/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/source3/utils/testparm.c b/source3/utils/testparm.c index b3e8f8badb..e3d6ce0274 100644 --- a/source3/utils/testparm.c +++ b/source3/utils/testparm.c @@ -34,8 +34,6 @@ #include "includes.h" -#include "module_dummy.h" - extern BOOL AllowDebugChange; /*********************************************** diff --git a/source3/utils/testprns.c b/source3/utils/testprns.c index 758e2b41dd..7e52b86afb 100644 --- a/source3/utils/testprns.c +++ b/source3/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/source3/web/swat.c b/source3/web/swat.c index e93fb2e5e1..7f9492933a 100644 --- a/source3/web/swat.c +++ b/source3/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/source3/wrepld/server.c b/source3/wrepld/server.c index 21bc2e4925..504818b8d5 100644 --- a/source3/wrepld/server.c +++ b/source3/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; |