sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-08 21:18:16 +03:00
Code

Clean up some git merges gone wrong.

Browse Source
This commit is contained in:
Jelmer Vernooij 2008-05-10 20:59:17 +02:00
parent cca75ae22d
commit 42eb6b3346
7 changed files with 3 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/auth/ntlm/auth.c
View File

@ -522,7 +522,7 @@ _PUBLIC_ NTSTATUS auth_init(void)
extern NTSTATUS auth_sam_init(void);
extern NTSTATUS auth_server_init(void);
init_module_fn static_init[] = { STATIC_service_auth_MODULES };
init_module_fn static_init[] = { STATIC_auth_MODULES };
if (initialized) return NT_STATUS_OK;
initialized = true;

2
source/build/smb_build/config_mk.pm
View File

@ -253,7 +253,7 @@ sub run_config_mk($$$$)
next;
}
die("$parsing_file:$linenum: Bad line while parsing $parsing_file");
die("$parsing_file:$linenum: Bad line");
}
$makefile .= "# }END $parsing_file\n";

2
source/build/smb_build/main.pl
View File

@ -51,7 +51,7 @@ foreach my $key (values %$OUTPUT) {
$mkenv->StaticLibraryPrimitives($key) if grep(/STATIC_LIBRARY/, @{$key->{OUTPUT_TYPE}});
$mkenv->MergedObj($key) if grep(/MERGED_OBJ/, @{$key->{OUTPUT_TYPE}});
$kenv->SharedLibraryPrimitives($key) if ($key->{TYPE} eq "LIBRARY") and
$mkenv->SharedLibraryPrimitives($key) if ($key->{TYPE} eq "LIBRARY") and
grep(/SHARED_LIBRARY/, @{$key->{OUTPUT_TYPE}});
if ($key->{TYPE} eq "LIBRARY" and
${$key->{OUTPUT_TYPE}}[0] eq "SHARED_LIBRARY") {

8
source/build/smb_build/makefile.pm
View File

@ -176,14 +176,6 @@ sub MergedObj($$)
$self->output("\$(call partial_link_template, $ctx->{OUTPUT}, \$($ctx->{NAME}_OBJ_FILES))\n");
}
sub StaticLibraryPrimitives($$)
{
my ($self,$ctx) = @_;
$self->output("$ctx->{NAME}_OUTPUT = $ctx->{OUTPUT}\n");
$self->_prepare_list($ctx, "FULL_OBJ_LIST");
}
sub InitFunctions($$)
{
my ($self, $ctx) = @_;

4
source/dsdb/samdb/ldb_modules/config.mk
View File

@ -4,11 +4,7 @@
SUBSYSTEM = LIBLDB
OUTPUT_TYPE = SHARED_LIBRARY
PRIVATE_DEPENDENCIES = LIBTALLOC LIBNDR NDR_MISC
<<<<<<< HEAD:source/dsdb/samdb/ldb_modules/config.mk
INIT_FUNCTION = LDB_MODULE(objectguid)
=======
INIT_FUNCTION = objectguid_module_module_ops
>>>>>>> 5f3a70f285ad8a412105c0e498e486f93fc279bc:source/dsdb/samdb/ldb_modules/config.mk
# End MODULE ldb_objectguid
################################################

4
source/librpc/config.mk
View File

@ -782,8 +782,6 @@ PRIVATE_DEPENDENCIES = RPC_NDR_DFS PYTALLOC
python_dfs_OBJ_FILES = librpc/gen_ndr/py_dfs.o
python_dfs_OBJ_FILES = gen_ndr/py_dfs.o
[PYTHON::python_unixinfo]
PRIVATE_DEPENDENCIES = RPC_NDR_UNIXINFO PYTALLOC
@ -794,8 +792,6 @@ PRIVATE_DEPENDENCIES = RPC_NDR_DRSUAPI PYTALLOC
python_drsuapi_OBJ_FILES = librpc/gen_ndr/py_drsuapi.o
python_drsuapi_OBJ_FILES = gen_ndr/py_drsuapi.o
[PYTHON::python_dcerpc_security]
PRIVATE_DEPENDENCIES = PYTALLOC

2
source/scripting/python/modules.c
View File

@ -39,12 +39,10 @@ extern void initdrsuapi(void);
extern void initwinreg(void);
extern void initepmapper(void);
extern void initinitshutdown(void);
static void initdcerpc_misc(void) {}
extern void initmgmt(void);
extern void initnet(void);
extern void initatsvc(void);
extern void initsamr(void);
static void initdcerpc_security(void) {}
extern void initlsa(void);
extern void initsvcctl(void);
extern void initwkssvc(void);