Reverse previous patch from Stefan and me after comments by Andrew Bartlett

(This used to be commit d817eaf0ecca2d878ab1ffcf7a747a02d71c811e)

diff --git a/source3/client/client.c b/source3/client/client.c
index c8d2ca7b04ff05bce1434497b3207c33835dfe55..36c76cbf15d67336383652774c6dcb3fa95b42fc 100644 (file)
--- 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 eeaec6420407740783f558ca2a08d5838bc311dc..1ee7dbc8cb93137df242da5983128e8b87e26081 100644 (file)
--- 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 eef663ebfd24fc81a78292e60af5448db4ebddd6..68165792da3df3f86f95284d67b0113485aa369f 100644 (file)
--- 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 411a406a929d5565b66b96db00da618baf0d09dc..d9300f4668f99b1c3eb2a8c50b35d47b225c85c1 100644 (file)
--- 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 7c59344be2ba4e45e1cf47bd8ba3cb0c693003f1..fb6f67625c0da72b44f3ef1080bd84db44269896 100644 (file)
--- a/source3/nsswitch/winbindd.c
+++ b/source3/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/source3/passdb/pdb_interface.c b/source3/passdb/pdb_interface.c
index dc2b43d204d65a4ef3e1ab94d7ec6703099fc17a..7b44df193fccfd72da0c6c027a41d8fc46ce61d4 100644 (file)
--- 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 fb0845e615b54f388d940dc8415b47faaade9f2a..a1b0a8cd34550d41e035b0e77777487552e0bccd 100644 (file)
--- 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 e933c4d3d4597c11f9e751920583f435c6441e51..d46be42eba6e7f260c329de5340d2c37a60b2fd9 100644 (file)
--- 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 c18d2c100bc7b5daea4743680ff52c590abc1e1a..63b9590dd61639605633ff0714623d50b89b347b 100644 (file)
--- 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 596596eb8a8fd3e8e456b5e62e97512cfeedaabc..97844b5609ecfbea1ad374ab0862d453079592f4 100644 (file)
--- 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 a4da1baff27a1a52a9688ba393e2b56b5e60e1c5..06dead3f16f26a70e2e3a745ff88a2621e74e54f 100644 (file)
--- 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 091b6337ab1905c11a1c132eb36e165fac171c83..8abb0a20d2e6ff275db06705d88e6d8577f76caa 100644 (file)
--- 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 27b77e2a83bf91db3aef084ffc3d0808c1433aeb..a82fa05203e270ab3d850f1a45d18881f4b0978e 100644 (file)
--- 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 e88a39a4839f89e7973c92a7bf50ae4b83bd4e39..086f8d5d3311eef45e42c0fb02e604191864eca8 100644 (file)
--- 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 613082225a2ceac5ea6eeec19c6b03bedd3ae066..ce21a09025eb9330db546f47ca340ed3b6fece02 100644 (file)
--- 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 4141b29cc2012f46e8b35af4dff42be34bcca55e..07d7f1547eddd605a03832b4b445b6f75de7a47f 100644 (file)
--- 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 d6b84126a0b665ff50cc71985a11d4de0a3526ca..3b28a3c496b90a9515e97057ebb5caba02b5f0a4 100644 (file)
--- 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 b2a86bb020160fd23be3301b61d8580c7e3c3b32..aa245a920a71fda222fa82c2f69e10b383b12d8c 100644 (file)
--- 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 7083961ccb5846ab7929c757f09026e5916eb038..d2c5cbc00ed41579c9ad01c7ef3dbc0df6a2c5c8 100644 (file)
--- 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 0d63afda72c688b35b384c8812af4e70a6f5286a..a713f3aa2dd3189fca4a4ae04686f56e26df7d80 100644 (file)
--- 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 5116855e71b6a8d8ba6a8ecd41be3435c7c78638..3a3d06a6452478c009d4a042d741761e9cf1a994 100644 (file)
--- 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 8abdfd6f77e75e2c8e493abd59e3545c88951556..7c2d820c8102d25ccbf51f614000635b2952a907 100644 (file)
--- 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 11a2a9d8baaa5e60d27021cec82c387bb1e1d92d..ae109f69b65c36e5bab997dae8c9c1b2bcd0fcef 100644 (file)
--- 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 35a9b05dcd776fd5ba4056e7005ca3e0a502937a..9d8a6577263379200e76edcbc3b5f29783e36b09 100644 (file)
--- 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 0c68bfc329af7c4b8eae5bb2a1507be2ac3c1eb8..06add6af228a306dbe90edf040cc7412a7a9b2eb 100644 (file)
--- 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 9ba243a4a58ac337aaf65e2abf879b0e4a1e215c..9c7379ca2a9c94837213afe270d02cda8fb6d1d8 100644 (file)
--- 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 fe5208227d7682767dfa1902337e0c4c6362ecbc..1a0d639f0254efdbef8a1476b5d1eec7e943c3c3 100644 (file)
--- 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 2070adb3e56ae74276439b0882bc0ba54b817240..577e467fbdbe71717a2fb8455b86073c18f8d2cc 100644 (file)
--- 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 bc669b4aa165dfccceb85eb8933c2905dbdd3db1..cbe1bd448f8b9ed2bb240590025d83a339b578df 100644 (file)
--- 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 fab55baabbb625bd8b1d41df75d0dcd142b96cde..bbaeecdd6bb2686ef6ca4db7518b2b0b349748fb 100644 (file)
--- 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 b3e8f8badbfd973803c669b29e7356f8bf6ee83e..e3d6ce02748d7a754a20bfc30edf5f79e3d60165 100644 (file)
--- 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 758e2b41dd6043af2e0590667595d52c555b3c5d..7e52b86afb6979bd731ebc177d98fbca1e9767c0 100644 (file)
--- 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 e93fb2e5e124a1247fc83cb8fb38c957b1ec0e9c..7f9492933a540df4cfcfbb7648f37fea62bcacea 100644 (file)
--- 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 21bc2e4925b9a2a741a3056ca125117d79885604..504818b8d5277d80e8e3f5d7660f14b3b960aae4 100644 (file)
--- 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;