sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-23 17:34:34 +03:00
Code

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

Browse Source
This commit is contained in:
Jelmer Vernooij 0001-01-01 00:00:00 +00:00
parent 74d9ecfe2d
commit d817eaf0ec
34 changed files with 2 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/client/client.c
View 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;

2
source/client/smbmount.c
View File

@ -22,8 +22,6 @@
#include "includes.h"
#include "module_dummy.h"
#include <mntent.h>
#include <asm/types.h>
#include <linux/smb_fs.h>

2
source/client/smbspool.c
View File

@ -24,8 +24,6 @@
#include "includes.h"
#include "module_dummy.h"
/*
* Globals...
*/

2
source/nmbd/nmbd.c
View File

@ -23,8 +23,6 @@
#include "includes.h"
#include "module_dummy.h"
int ClientNMB = -1;
int ClientDGRAM = -1;
int global_nmb_port = -1;

2
source/nsswitch/winbindd.c
View File

@ -24,8 +24,6 @@
#include "winbindd.h"
#include "module_dummy.h"
BOOL opt_nocache = False;
BOOL opt_dual_daemon = False;

4
source/passdb/pdb_interface.c
View 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;
}
}

4
source/rpcclient/rpcclient.c
View File

@ -23,10 +23,6 @@
#include "includes.h"
#include "rpcclient.h"
#define HAVE_SMB_REGISTER_PASSDB
#include "module_dummy.h"
DOM_SID domain_sid;

7
source/smbd/server.c
View File

@ -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 */

2
source/torture/locktest.c
View File

@ -22,8 +22,6 @@
#include "includes.h"
#include "module_dummy.h"
static fstring password[2];
static fstring username[2];
static int got_user;

2
source/torture/locktest2.c
View File

@ -22,8 +22,6 @@
#include "includes.h"
#include "module_dummy.h"
static fstring password;
static fstring username;
static int got_pass;

2
source/torture/masktest.c
View File

@ -22,8 +22,6 @@
#include "includes.h"
#include "module_dummy.h"
static fstring password;
static fstring username;
static int got_pass;

2
source/torture/msgtest.c
View File

@ -25,8 +25,6 @@
#include "includes.h"
#include "module_dummy.h"
static int pong_count;
/****************************************************************************

2
source/torture/nsstest.c
View 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;

2
source/torture/rpctorture.c
View File

@ -20,8 +20,6 @@
#include "includes.h"
#include "module_dummy.h"
#ifndef REGISTER
#define REGISTER 0
#endif

2
source/torture/smbiconv.c
View 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)
{

2
source/torture/torture.c
View 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";

6
source/torture/vfstest.c
View File

@ -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;

4
source/utils/net.c
View File

@ -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. */

2
source/utils/nmblookup.c
View File

@ -24,8 +24,6 @@
#include "includes.h"
#include "module_dummy.h"
extern BOOL AllowDebugChange;
static BOOL give_flags = False;

2
source/utils/ntlm_auth.c
View 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 {

3
source/utils/pdbedit.c
View 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

2
source/utils/profiles.c
View 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;

2
source/utils/rpccheck.c
View File

@ -20,8 +20,6 @@
#include "includes.h"
#include "module_dummy.h"
main()
{
char filter[]="0123456789ABCDEF";

2
source/utils/smbcacls.c
View File

@ -24,8 +24,6 @@
#include "includes.h"
#include "module_dummy.h"
static pstring owner_username;
static fstring server;
static int test_args = False;

2
source/utils/smbcontrol.c
View 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

2
source/utils/smbcquotas.c
View 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

2
source/utils/smbfilter.c
View File

@ -20,8 +20,6 @@
#include "includes.h"
#include "module_dummy.h"
#define SECURITY_MASK 0
#define SECURITY_SET 0

3
source/utils/smbpasswd.c
View File

@ -19,9 +19,6 @@
#include "includes.h"
#define HAVE_SMB_REGISTER_PASSDB
#include "module_dummy.h"
extern BOOL AllowDebugChange;
/*

2
source/utils/smbtree.c
View File

@ -22,8 +22,6 @@
#include "includes.h"
#include "module_dummy.h"
static BOOL use_bcast;
/* How low can we go? */

2
source/utils/status.c
View 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 */

2
source/utils/testparm.c
View File

@ -34,8 +34,6 @@
#include "includes.h"
#include "module_dummy.h"
extern BOOL AllowDebugChange;
/***********************************************

2
source/utils/testprns.c
View File

@ -32,8 +32,6 @@
#include "includes.h"
#include "module_dummy.h"
int main(int argc, char *argv[])
{
const char *pszTemp;

3
source/web/swat.c
View 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;

2
source/wrepld/server.c
View 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;