Reverse previous patch from Stefan and me after comments by Andrew Bartlett.
authorJelmer Vernooij <jelmer@samba.org>
Sat, 10 May 2003 11:47:29 +0000 (11:47 +0000)
committerJelmer Vernooij <jelmer@samba.org>
Sat, 10 May 2003 11:47:29 +0000 (11:47 +0000)
34 files changed:
source/client/client.c
source/client/smbmount.c
source/client/smbspool.c
source/nmbd/nmbd.c
source/nsswitch/winbindd.c
source/passdb/pdb_interface.c
source/rpcclient/rpcclient.c
source/smbd/server.c
source/torture/locktest.c
source/torture/locktest2.c
source/torture/masktest.c
source/torture/msgtest.c
source/torture/nsstest.c
source/torture/rpctorture.c
source/torture/smbiconv.c
source/torture/torture.c
source/torture/vfstest.c
source/utils/net.c
source/utils/nmblookup.c
source/utils/ntlm_auth.c
source/utils/pdbedit.c
source/utils/profiles.c
source/utils/rpccheck.c
source/utils/smbcacls.c
source/utils/smbcontrol.c
source/utils/smbcquotas.c
source/utils/smbfilter.c
source/utils/smbpasswd.c
source/utils/smbtree.c
source/utils/status.c
source/utils/testparm.c
source/utils/testprns.c
source/web/swat.c
source/wrepld/server.c

index 04804ac1f1c9819c361e97ea74fd1749658fda3d..b498b5b4a88638521d4c50a799ce8ac71ea40100 100644 (file)
@@ -28,8 +28,6 @@
 #define REGISTER 0
 #endif
 
-#include "module_dummy.h"
-
 struct cli_state *cli;
 extern BOOL in_client;
 static int port = 0;
index eeaec6420407740783f558ca2a08d5838bc311dc..1ee7dbc8cb93137df242da5983128e8b87e26081 100644 (file)
@@ -22,8 +22,6 @@
 
 #include "includes.h"
 
-#include "module_dummy.h"
-
 #include <mntent.h>
 #include <asm/types.h>
 #include <linux/smb_fs.h>
index eef663ebfd24fc81a78292e60af5448db4ebddd6..68165792da3df3f86f95284d67b0113485aa369f 100644 (file)
@@ -24,8 +24,6 @@
 
 #include "includes.h"
 
-#include "module_dummy.h"
-
 /*
  * Globals...
  */
index 81ef3b79a511b6056382d5db3b589c300904bffa..eec447688f07d06c0f5f686c47c6b28c500c495c 100644 (file)
@@ -23,8 +23,6 @@
 
 #include "includes.h"
 
-#include "module_dummy.h"
-
 int ClientNMB       = -1;
 int ClientDGRAM     = -1;
 int global_nmb_port = -1;
index b65af3d940e3caecc0068915ff7822f8e66e7fed..018edcb6492077cacfeef46e4b5305432b88e4c3 100644 (file)
@@ -24,6 +24,7 @@
 
 #include "winbindd.h"
 
+#define HAVE_SMB_REGISTER_PASSDB
 #include "module_dummy.h"
 
 BOOL opt_nocache = False;
index dc2b43d204d65a4ef3e1ab94d7ec6703099fc17a..7b44df193fccfd72da0c6c027a41d8fc46ce61d4 100644 (file)
@@ -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;
                }
        }
        
index 68f8fbae8b9c75b2dcfbb06e527bc9ccd6ffd060..b01e2d694c55b8573bc89d68018ef61f3d17f2b9 100644 (file)
 #include "includes.h"
 #include "rpcclient.h"
 
-
-#define HAVE_SMB_REGISTER_PASSDB
-#include "module_dummy.h"
-
 DOM_SID domain_sid;
 
 
index 11f06daf0dcc325d5b9bd791f4494d54b0f74dbd..c24fc5134dea440d41674e5d103b7e1cb0fdf381 100644 (file)
 
 #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 */
index c18d2c100bc7b5daea4743680ff52c590abc1e1a..63b9590dd61639605633ff0714623d50b89b347b 100644 (file)
@@ -22,8 +22,6 @@
 
 #include "includes.h"
 
-#include "module_dummy.h"
-
 static fstring password[2];
 static fstring username[2];
 static int got_user;
index 596596eb8a8fd3e8e456b5e62e97512cfeedaabc..97844b5609ecfbea1ad374ab0862d453079592f4 100644 (file)
@@ -22,8 +22,6 @@
 
 #include "includes.h"
 
-#include "module_dummy.h"
-
 static fstring password;
 static fstring username;
 static int got_pass;
index a4da1baff27a1a52a9688ba393e2b56b5e60e1c5..06dead3f16f26a70e2e3a745ff88a2621e74e54f 100644 (file)
@@ -22,8 +22,6 @@
 
 #include "includes.h"
 
-#include "module_dummy.h"
-
 static fstring password;
 static fstring username;
 static int got_pass;
index 091b6337ab1905c11a1c132eb36e165fac171c83..8abb0a20d2e6ff275db06705d88e6d8577f76caa 100644 (file)
@@ -25,8 +25,6 @@
 
 #include "includes.h"
 
-#include "module_dummy.h"
-
 static int pong_count;
 
 /****************************************************************************
index 27b77e2a83bf91db3aef084ffc3d0808c1433aeb..a82fa05203e270ab3d850f1a45d18881f4b0978e 100644 (file)
@@ -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;
index e88a39a4839f89e7973c92a7bf50ae4b83bd4e39..086f8d5d3311eef45e42c0fb02e604191864eca8 100644 (file)
@@ -20,8 +20,6 @@
 
 #include "includes.h"
 
-#include "module_dummy.h"
-
 #ifndef REGISTER
 #define REGISTER 0
 #endif
index 613082225a2ceac5ea6eeec19c6b03bedd3ae066..ce21a09025eb9330db546f47ca340ed3b6fece02 100644 (file)
@@ -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)
 {
index d660b6d003f5dfaf56f157b54e896b3bc96fe7ed..840b6ad2947a26e77da71cd3a48829e57d638888 100644 (file)
@@ -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";
index d6b84126a0b665ff50cc71985a11d4de0a3526ca..3b28a3c496b90a9515e97057ebb5caba02b5f0a4 100644 (file)
 #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;
index b2a86bb020160fd23be3301b61d8580c7e3c3b32..aa245a920a71fda222fa82c2f69e10b383b12d8c 100644 (file)
 #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. */
index 7083961ccb5846ab7929c757f09026e5916eb038..d2c5cbc00ed41579c9ad01c7ef3dbc0df6a2c5c8 100644 (file)
@@ -24,8 +24,6 @@
 
 #include "includes.h"
 
-#include "module_dummy.h"
-
 extern BOOL AllowDebugChange;
 
 static BOOL give_flags = False;
index b30efac4b73255ced9487c6ce9ea37d6bd2a931b..42490190f320f579b7f34d144b2fb3d9015be772 100644 (file)
@@ -27,8 +27,6 @@
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_WINBIND
 
-#include "module_dummy.h"
-
 #define SQUID_BUFFER_SIZE 2010
 
 enum squid_mode {
index 81d0a61287d74a933fb02ec5be24d414590ed697..13f35e888068c5a67381f65ac62ad50ff972b403 100644 (file)
@@ -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
index 4a6fa59b53edc2ebb21a258106d95f734b1a3b0e..afaa83f63846e86e8a8e8b236878814eb7b95ad4 100644 (file)
@@ -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;
 
index 11a2a9d8baaa5e60d27021cec82c387bb1e1d92d..ae109f69b65c36e5bab997dae8c9c1b2bcd0fcef 100644 (file)
@@ -20,8 +20,6 @@
 
 #include "includes.h"
 
-#include "module_dummy.h"
-
 main()
 {
        char filter[]="0123456789ABCDEF";
index 35a9b05dcd776fd5ba4056e7005ca3e0a502937a..9d8a6577263379200e76edcbc3b5f29783e36b09 100644 (file)
@@ -24,8 +24,6 @@
 
 #include "includes.h"
 
-#include "module_dummy.h"
-
 static pstring owner_username;
 static fstring server;
 static int test_args = False;
index 0c68bfc329af7c4b8eae5bb2a1507be2ac3c1eb8..06add6af228a306dbe90edf040cc7412a7a9b2eb 100644 (file)
@@ -25,8 +25,6 @@
 
 #include "includes.h"
 
-#include "module_dummy.h"
-
 /* Default timeout value when waiting for replies (in seconds) */
 
 #define DEFAULT_TIMEOUT 10
index 9ba243a4a58ac337aaf65e2abf879b0e4a1e215c..9c7379ca2a9c94837213afe270d02cda8fb6d1d8 100644 (file)
@@ -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
index fe5208227d7682767dfa1902337e0c4c6362ecbc..1a0d639f0254efdbef8a1476b5d1eec7e943c3c3 100644 (file)
@@ -20,8 +20,6 @@
 
 #include "includes.h"
 
-#include "module_dummy.h"
-
 #define SECURITY_MASK 0
 #define SECURITY_SET  0
 
index 2070adb3e56ae74276439b0882bc0ba54b817240..577e467fbdbe71717a2fb8455b86073c18f8d2cc 100644 (file)
@@ -19,9 +19,6 @@
 
 #include "includes.h"
 
-#define HAVE_SMB_REGISTER_PASSDB
-#include "module_dummy.h"
-
 extern BOOL AllowDebugChange;
 
 /*
index bc669b4aa165dfccceb85eb8933c2905dbdd3db1..cbe1bd448f8b9ed2bb240590025d83a339b578df 100644 (file)
@@ -22,8 +22,6 @@
 
 #include "includes.h"
 
-#include "module_dummy.h"
-
 static BOOL use_bcast;
 
 /* How low can we go? */
index fab55baabbb625bd8b1d41df75d0dcd142b96cde..bbaeecdd6bb2686ef6ca4db7518b2b0b349748fb 100644 (file)
@@ -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 */
index b3e8f8badbfd973803c669b29e7356f8bf6ee83e..e3d6ce02748d7a754a20bfc30edf5f79e3d60165 100644 (file)
@@ -34,8 +34,6 @@
 
 #include "includes.h"
 
-#include "module_dummy.h"
-
 extern BOOL AllowDebugChange;
 
 /***********************************************
index 758e2b41dd6043af2e0590667595d52c555b3c5d..7e52b86afb6979bd731ebc177d98fbca1e9767c0 100644 (file)
@@ -32,8 +32,6 @@
 
 #include "includes.h"
 
-#include "module_dummy.h"
-
 int main(int argc, char *argv[])
 {
    const char *pszTemp;
index e93fb2e5e124a1247fc83cb8fb38c957b1ec0e9c..7f9492933a540df4cfcfbb7648f37fea62bcacea 100644 (file)
@@ -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;
index 21bc2e4925b9a2a741a3056ca125117d79885604..504818b8d5277d80e8e3f5d7660f14b3b960aae4 100644 (file)
@@ -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;