Clean up some git merges gone wrong.

(This used to be commit 42eb6b33462228467e65a51bbf624c481802b090)

diff --git a/source4/auth/ntlm/auth.c b/source4/auth/ntlm/auth.c
index ad79a40dd239e65afb4c46efd2f10085b0aa9569..0f1ef3ccdb71e24b13d1d445f2cebb30ebfc2192 100644 (file)
--- a/source4/auth/ntlm/auth.c
+++ b/source4/auth/ntlm/auth.c
@@ -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;

diff --git a/source4/build/smb_build/config_mk.pm b/source4/build/smb_build/config_mk.pm
index 7b23e8393435e35b57a1737c9af3222ab109575b..81c3363cfbfcfd0ccfb014a594ffe7a373600e3c 100644 (file)
--- a/source4/build/smb_build/config_mk.pm
+++ b/source4/build/smb_build/config_mk.pm
@@ -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";

diff --git a/source4/build/smb_build/main.pl b/source4/build/smb_build/main.pl
index ccaac0b6fcae08e73e77291512abb0d862ce53c5..d31bea73f37606bc372ef31c384a7764e6681525 100644 (file)
--- a/source4/build/smb_build/main.pl
+++ b/source4/build/smb_build/main.pl
@@ -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") {

diff --git a/source4/build/smb_build/makefile.pm b/source4/build/smb_build/makefile.pm
index c56fdbf8cca6f13d8dd235b5ecbf3b5374b0d60b..495c8fb967f936049ad25e4a800db4e4b9480a23 100644 (file)
--- a/source4/build/smb_build/makefile.pm
+++ b/source4/build/smb_build/makefile.pm
@@ -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) = @_;

diff --git a/source4/dsdb/samdb/ldb_modules/config.mk b/source4/dsdb/samdb/ldb_modules/config.mk
index 69bfa14da09ed6db4094c4d3b1a8eb2dc5c9f2b6..5161d0fcf8fa5f0b21e4534e8dd513b69629bf49 100644 (file)
--- a/source4/dsdb/samdb/ldb_modules/config.mk
+++ b/source4/dsdb/samdb/ldb_modules/config.mk
@@ -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
 ################################################
 

diff --git a/source4/librpc/config.mk b/source4/librpc/config.mk
index 11f5acb39ceb83eb91f8f52a8f31fe0c07a22f6c..42da797054b030e7ca50d87cd1853fa616b49bdf 100644 (file)
--- a/source4/librpc/config.mk
+++ b/source4/librpc/config.mk
@@ -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
 

diff --git a/source4/scripting/python/modules.c b/source4/scripting/python/modules.c
index cbff14c7088acbe5de057d076392ef79f2864d86..0fe15b2fdab549f72a62087ae21831fc50283b62 100644 (file)
--- a/source4/scripting/python/modules.c
+++ b/source4/scripting/python/modules.c
@@ -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);