Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-test

(This used to be commit e891157b4ec7b2f845fb20c4106d80bf169f2072)

2 files changed, 82 insertions, 76 deletions

diff --git a/source4/dsdb/config.mk b/source4/dsdb/config.mk
index 1a20add91c..e334e4c6e3 100644
--- a/source4/dsdb/config.mk
+++ b/source4/dsdb/config.mk
@@ -10,31 +10,33 @@ PUBLIC_DEPENDENCIES = HEIMDAL_KRB5
 PRIVATE_DEPENDENCIES = LIBNDR NDR_MISC NDR_DRSUAPI NDR_DRSBLOBS NSS_WRAPPER \
 					   auth_system_session LDAP_ENCODE LIBCLI_AUTH LIBNDR \
 					   SAMDB_SCHEMA LDB_WRAP SAMDB_COMMON
-OBJ_FILES = \
+
+
+SAMDB_OBJ_FILES = $(addprefix dsdb/, \
 		samdb/samdb.o \
 		samdb/samdb_privilege.o \
 		samdb/cracknames.o \
-		repl/replicated_objects.o
-
+		repl/replicated_objects.o)
 
 # PUBLIC_HEADERS += dsdb/samdb/samdb.h
 
 [SUBSYSTEM::SAMDB_COMMON]
 PRIVATE_PROTO_HEADER = common/proto.h
 PRIVATE_DEPENDENCIES = LIBLDB
-OBJ_FILES = \
-		common/sidmap.o \
-		common/flag_mapping.o \
-		common/util.o
+
+SAMDB_COMMON_OBJ_FILES = $(addprefix dsdb/common/, \
+		sidmap.o \
+		flag_mapping.o \
+		util.o)
 
 [SUBSYSTEM::SAMDB_SCHEMA]
 PRIVATE_PROTO_HEADER = schema/proto.h
 PRIVATE_DEPENDENCIES = SAMDB_COMMON NDR_DRSUAPI NDR_DRSBLOBS
-OBJ_FILES = \
-		schema/schema_init.o \
-		schema/schema_syntax.o \
-		schema/schema_constructed.o \
 
+SAMDB_SCHEMA_OBJ_FILES = $(addprefix dsdb/schema/, \
+		schema_init.o \
+		schema_syntax.o \
+		schema_constructed.o)
 
 # PUBLIC_HEADERS += dsdb/schema/schema.h
 
@@ -43,15 +45,17 @@ OBJ_FILES = \
 [MODULE::DREPL_SRV]
 INIT_FUNCTION = server_service_drepl_init
 SUBSYSTEM = service
-OBJ_FILES = \
-		repl/drepl_service.o \
-		repl/drepl_periodic.o \
-		repl/drepl_partitions.o \
-		repl/drepl_out_pull.o \
-		repl/drepl_out_helpers.o
 PRIVATE_PROTO_HEADER = repl/drepl_service_proto.h
 PRIVATE_DEPENDENCIES = \
 		SAMDB \
 		process_model 
 # End SUBSYSTEM DREPL_SRV
 #######################
+
+DREPL_SRV_OBJ_FILES = $(addprefix dsdb/repl/, \
+		drepl_service.o \
+		drepl_periodic.o \
+		drepl_partitions.o \
+		drepl_out_pull.o \
+		drepl_out_helpers.o)
+
diff --git a/source4/dsdb/samdb/ldb_modules/config.mk b/source4/dsdb/samdb/ldb_modules/config.mk
index de93b5638d..414b449ba8 100644
--- a/source4/dsdb/samdb/ldb_modules/config.mk
+++ b/source4/dsdb/samdb/ldb_modules/config.mk
@@ -5,11 +5,11 @@ SUBSYSTEM = LIBLDB
 OUTPUT_TYPE = SHARED_LIBRARY
 PRIVATE_DEPENDENCIES = LIBTALLOC LIBNDR NDR_MISC
 INIT_FUNCTION = objectguid_module_module_ops
-OBJ_FILES = \
-		objectguid.o
 # End MODULE ldb_objectguid
 ################################################
 
+ldb_objectguid_OBJ_FILES = dsdb/samdb/ldb_modules/objectguid.o
+
 ################################################
 # Start MODULE ldb_repl_meta_data
 [MODULE::ldb_repl_meta_data]
@@ -18,11 +18,12 @@ OUTPUT_TYPE = SHARED_LIBRARY
 PRIVATE_DEPENDENCIES = SAMDB LIBTALLOC LIBNDR NDR_MISC NDR_DRSUAPI \
 					   NDR_DRSBLOBS LIBNDR
 INIT_FUNCTION = repl_meta_data_module_module_ops
-OBJ_FILES = \
-		repl_meta_data.o
 # End MODULE ldb_repl_meta_data
 ################################################
 
+ldb_repl_meta_data_OBJ_FILES = \
+		dsdb/samdb/ldb_modules/repl_meta_data.o
+
 ################################################
 # Start MODULE ldb_dsdb_cache
 [MODULE::ldb_dsdb_cache]
@@ -30,11 +31,12 @@ SUBSYSTEM = LIBLDB
 OUTPUT_TYPE = SHARED_LIBRARY
 PRIVATE_DEPENDENCIES = SAMDB LIBTALLOC
 INIT_FUNCTION = dsdb_cache_module_module_ops
-OBJ_FILES = \
-		dsdb_cache.o
 # End MODULE ldb_dsdb_cache
 ################################################
 
+ldb_dsdb_cache_OBJ_FILES = \
+		dsdb/samdb/ldb_modules/dsdb_cache.o
+
 ################################################
 # Start MODULE ldb_schema_fsmo
 [MODULE::ldb_schema_fsmo]
@@ -42,11 +44,12 @@ SUBSYSTEM = LIBLDB
 OUTPUT_TYPE = SHARED_LIBRARY
 PRIVATE_DEPENDENCIES = SAMDB LIBTALLOC
 INIT_FUNCTION = schema_fsmo_module_module_ops
-OBJ_FILES = \
-		schema_fsmo.o
 # End MODULE ldb_schema_fsmo
 ################################################
 
+ldb_schema_fsmo_OBJ_FILES = \
+		dsdb/samdb/ldb_modules/schema_fsmo.o
+
 ################################################
 # Start MODULE ldb_naming_fsmo
 [MODULE::ldb_naming_fsmo]
@@ -54,11 +57,12 @@ SUBSYSTEM = LIBLDB
 OUTPUT_TYPE = SHARED_LIBRARY
 PRIVATE_DEPENDENCIES = SAMDB LIBTALLOC
 INIT_FUNCTION = naming_fsmo_module_module_ops
-OBJ_FILES = \
-		naming_fsmo.o
 # End MODULE ldb_naming_fsmo
 ################################################
 
+ldb_naming_fsmo_OBJ_FILES = \
+		dsdb/samdb/ldb_modules/naming_fsmo.o
+
 ################################################
 # Start MODULE ldb_pdc_fsmo
 [MODULE::ldb_pdc_fsmo]
@@ -66,11 +70,12 @@ SUBSYSTEM = LIBLDB
 OUTPUT_TYPE = SHARED_LIBRARY
 PRIVATE_DEPENDENCIES = SAMDB LIBTALLOC
 INIT_FUNCTION = pdc_fsmo_module_module_ops
-OBJ_FILES = \
-		pdc_fsmo.o
 # End MODULE ldb_pdc_fsmo
 ################################################
 
+ldb_pdc_fsmo_OBJ_FILES = \
+		dsdb/samdb/ldb_modules/pdc_fsmo.o
+
 ################################################
 # Start MODULE ldb_samldb
 [MODULE::ldb_samldb]
@@ -78,12 +83,13 @@ SUBSYSTEM = LIBLDB
 OUTPUT_TYPE = SHARED_LIBRARY
 PRIVATE_DEPENDENCIES = LIBTALLOC LDAP_ENCODE NDR_MISC SAMDB
 INIT_FUNCTION = samldb_module_module_ops
-OBJ_FILES = \
-		samldb.o
 #
 # End MODULE ldb_samldb
 ################################################
 
+ldb_samldb_OBJ_FILES = \
+		dsdb/samdb/ldb_modules/samldb.o
+
 ################################################
 # Start MODULE ldb_samba3sam
 [MODULE::ldb_samba3sam]
@@ -92,12 +98,13 @@ OUTPUT_TYPE = SHARED_LIBRARY
 INIT_FUNCTION = &ldb_samba3sam_module_module_ops
 PRIVATE_DEPENDENCIES = LIBTALLOC ldb_map SMBPASSWD NSS_WRAPPER LIBSECURITY \
 					   NDR_SECURITY
-OBJ_FILES = \
-		samba3sam.o
 #
 # End MODULE ldb_samldb
 ################################################
 
+ldb_samba3sam_OBJ_FILES = \
+		dsdb/samdb/ldb_modules/samba3sam.o
+
 ################################################
 # Start MODULE ldb_simple_ldap_map
 [MODULE::ldb_simple_ldap_map]
@@ -107,12 +114,13 @@ INIT_FUNCTION = &ldb_simple_ldap_map_module_module_ops
 PRIVATE_DEPENDENCIES = LIBTALLOC ldb_map LIBNDR NDR_MISC
 ENABLE = YES
 ALIASES = entryuuid nsuniqueid
-OBJ_FILES = \
-		simple_ldap_map.o
 #
 # End MODULE ldb_entryuuid
 ################################################
 
+ldb_simple_ldap_map_OBJ_FILES = \
+		dsdb/samdb/ldb_modules/simple_ldap_map.o
+
 # ################################################
 # # Start MODULE ldb_proxy
 # [MODULE::ldb_proxy]
@@ -132,25 +140,24 @@ SUBSYSTEM = LIBLDB
 PRIVATE_DEPENDENCIES = LIBTALLOC SAMDB
 OUTPUT_TYPE = SHARED_LIBRARY
 INIT_FUNCTION = rootdse_module_module_ops
-OBJ_FILES = \
-		rootdse.o
-#
 # End MODULE ldb_rootdse
 ################################################
 
+ldb_rootdse_OBJ_FILES = dsdb/samdb/ldb_modules/rootdse.o
+
 ################################################
 # Start MODULE ldb_password_hash
 [MODULE::ldb_password_hash]
 SUBSYSTEM = LIBLDB
 OUTPUT_TYPE = SHARED_LIBRARY
 INIT_FUNCTION = password_hash_module_module_ops
-OBJ_FILES = password_hash.o
 PRIVATE_DEPENDENCIES = HEIMDAL_HDB_KEYS LIBTALLOC HEIMDAL_KRB5 LDAP_ENCODE \
 					   LIBCLI_AUTH NDR_DRSBLOBS KERBEROS SAMDB
-#
 # End MODULE ldb_password_hash
 ################################################
 
+ldb_password_hash_OBJ_FILES = dsdb/samdb/ldb_modules/password_hash.o
+
 ################################################
 # Start MODULE ldb_local_password
 [MODULE::ldb_local_password]
@@ -158,11 +165,11 @@ PRIVATE_DEPENDENCIES = LIBTALLOC LIBNDR SAMDB
 OUTPUT_TYPE = SHARED_LIBRARY
 SUBSYSTEM = LIBLDB
 INIT_FUNCTION = local_password_module_module_ops
-OBJ_FILES = local_password.o
-#
 # End MODULE ldb_local_password
 ################################################
 
+ldb_local_password_OBJ_FILES = dsdb/samdb/ldb_modules/local_password.o
+
 ################################################
 # Start MODULE ldb_kludge_acl
 [MODULE::ldb_kludge_acl]
@@ -170,12 +177,12 @@ PRIVATE_DEPENDENCIES = LIBTALLOC LIBSECURITY SAMDB
 OUTPUT_TYPE = SHARED_LIBRARY
 SUBSYSTEM = LIBLDB
 INIT_FUNCTION = &ldb_kludge_acl_module_ops
-OBJ_FILES = \
-		kludge_acl.o
-#
+
 # End MODULE ldb_kludge_acl
 ################################################
 
+ldb_kludge_acl_OBJ_FILES = dsdb/samdb/ldb_modules/kludge_acl.o
+
 ################################################
 # Start MODULE ldb_extended_dn
 [MODULE::ldb_extended_dn]
@@ -183,12 +190,11 @@ SUBSYSTEM = LIBLDB
 OUTPUT_TYPE = SHARED_LIBRARY
 PRIVATE_DEPENDENCIES = LIBTALLOC LIBNDR LIBSECURITY SAMDB
 INIT_FUNCTION = &ldb_extended_dn_module_ops
-OBJ_FILES = \
-		extended_dn.o
-#
 # End MODULE ldb_extended_dn
 ################################################
 
+ldb_extended_dn_OBJ_FILES = dsdb/samdb/ldb_modules/extended_dn.o
+
 ################################################
 # Start MODULE ldb_show_deleted
 [MODULE::ldb_show_deleted]
@@ -196,12 +202,11 @@ SUBSYSTEM = LIBLDB
 OUTPUT_TYPE = SHARED_LIBRARY
 PRIVATE_DEPENDENCIES = LIBTALLOC
 INIT_FUNCTION = &ldb_show_deleted_module_ops
-OBJ_FILES = \
-		show_deleted.o
-#
 # End MODULE ldb_show_deleted
 ################################################
 
+ldb_show_deleted_OBJ_FILES = dsdb/samdb/ldb_modules/show_deleted.o
+
 ################################################
 # Start MODULE ldb_partition
 [MODULE::ldb_partition]
@@ -209,12 +214,11 @@ SUBSYSTEM = LIBLDB
 OUTPUT_TYPE = SHARED_LIBRARY
 PRIVATE_DEPENDENCIES = LIBTALLOC SAMDB
 INIT_FUNCTION = &ldb_partition_module_ops
-OBJ_FILES = \
-		partition.o
-#
 # End MODULE ldb_partition
 ################################################
 
+ldb_partition_OBJ_FILES = dsdb/samdb/ldb_modules/partition.o
+
 ################################################
 # Start MODULE ldb_schema
 [MODULE::ldb_schema]
@@ -222,12 +226,11 @@ SUBSYSTEM = LIBLDB
 OUTPUT_TYPE = SHARED_LIBRARY
 PRIVATE_DEPENDENCIES = LIBTALLOC LIBLDB
 INIT_FUNCTION = &ldb_schema_module_ops
-OBJ_FILES = \
-		schema.o schema_syntax.o
-#
 # End MODULE ldb_schema
 ################################################
 
+ldb_schema_OBJ_FILES = $(addprefix dsdb/samdb/ldb_modules/, schema.o schema_syntax.o)
+
 ################################################
 # Start MODULE ldb_update_kt
 [MODULE::ldb_update_keytab]
@@ -236,12 +239,11 @@ OUTPUT_TYPE = SHARED_LIBRARY
 PRIVATE_DEPENDENCIES = LIBTALLOC CREDENTIALS
 #Also depends on credentials, but that would loop
 INIT_FUNCTION = &ldb_update_kt_module_ops
-OBJ_FILES = \
-		update_keytab.o 
-#
 # End MODULE ldb_update_kt
 ################################################
 
+ldb_update_keytab_OBJ_FILES = dsdb/samdb/ldb_modules/update_keytab.o 
+
 ################################################
 # Start MODULE ldb_objectclass
 [MODULE::ldb_objectclass]
@@ -250,11 +252,11 @@ OUTPUT_TYPE = SHARED_LIBRARY
 CFLAGS = -Ilib/ldb/include
 PRIVATE_DEPENDENCIES = LIBTALLOC LIBSECURITY NDR_SECURITY SAMDB
 SUBSYSTEM = LIBLDB
-OBJ_FILES = \
-		objectclass.o
 # End MODULE ldb_objectclass
 ################################################
 
+ldb_objectclass_OBJ_FILES = dsdb/samdb/ldb_modules/objectclass.o
+
 ################################################
 # Start MODULE ldb_subtree_rename
 [MODULE::ldb_subtree_rename]
@@ -262,11 +264,11 @@ INIT_FUNCTION = &ldb_subtree_rename_module_ops
 CFLAGS = -Ilib/ldb/include
 PRIVATE_DEPENDENCIES = LIBTALLOC
 SUBSYSTEM = LIBLDB
-OBJ_FILES = \
-		subtree_rename.o
 # End MODULE ldb_subtree_rename
 ################################################
 
+ldb_subtree_rename_OBJ_FILES = dsdb/samdb/ldb_modules/subtree_rename.o
+
 ################################################
 # Start MODULE ldb_subtree_rename
 [MODULE::ldb_subtree_delete]
@@ -274,11 +276,11 @@ INIT_FUNCTION = &ldb_subtree_delete_module_ops
 CFLAGS = -Ilib/ldb/include
 PRIVATE_DEPENDENCIES = LIBTALLOC
 SUBSYSTEM = LIBLDB
-OBJ_FILES = \
-		subtree_delete.o
 # End MODULE ldb_subtree_rename
 ################################################
 
+ldb_subtree_delete_OBJ_FILES = dsdb/samdb/ldb_modules/subtree_delete.o
+
 ################################################
 # Start MODULE ldb_linked_attributes
 [MODULE::ldb_linked_attributes]
@@ -287,11 +289,11 @@ CFLAGS = -Ilib/ldb/include
 OUTPUT_TYPE = SHARED_LIBRARY
 PRIVATE_DEPENDENCIES = LIBTALLOC SAMDB
 SUBSYSTEM = LIBLDB
-OBJ_FILES = \
-		linked_attributes.o
 # End MODULE ldb_linked_attributes
 ################################################
 
+ldb_linked_attributes_OBJ_FILES = dsdb/samdb/ldb_modules/linked_attributes.o
+
 ################################################
 # Start MODULE ldb_ranged_results
 [MODULE::ldb_ranged_results]
@@ -299,11 +301,11 @@ INIT_FUNCTION = &ldb_ranged_results_module_ops
 CFLAGS = -Ilib/ldb/include
 PRIVATE_DEPENDENCIES = LIBTALLOC
 SUBSYSTEM = LIBLDB
-OBJ_FILES = \
-		ranged_results.o
 # End MODULE ldb_ranged_results
 ################################################
 
+ldb_ranged_results_OBJ_FILES = dsdb/samdb/ldb_modules/ranged_results.o
+
 ################################################
 # Start MODULE ldb_anr
 [MODULE::ldb_anr]
@@ -312,11 +314,11 @@ CFLAGS = -Ilib/ldb/include
 OUTPUT_TYPE = SHARED_LIBRARY
 PRIVATE_DEPENDENCIES = LIBTALLOC LIBSAMBA-UTIL SAMDB
 SUBSYSTEM = LIBLDB
-OBJ_FILES = \
-		anr.o
 # End MODULE ldb_anr
 ################################################
 
+ldb_anr_OBJ_FILES = dsdb/samdb/ldb_modules/anr.o
+
 ################################################
 # Start MODULE ldb_normalise
 [MODULE::ldb_normalise]
@@ -325,11 +327,11 @@ CFLAGS = -Ilib/ldb/include
 OUTPUT_TYPE = SHARED_LIBRARY
 PRIVATE_DEPENDENCIES = LIBTALLOC LIBSAMBA-UTIL SAMDB
 SUBSYSTEM = LIBLDB
-OBJ_FILES = \
-		normalise.o
 # End MODULE ldb_normalise
 ################################################
 
+ldb_normalise_OBJ_FILES = dsdb/samdb/ldb_modules/normalise.o
+
 ################################################
 # Start MODULE ldb_instancetype
 [MODULE::ldb_instancetype]
@@ -338,8 +340,8 @@ CFLAGS = -Ilib/ldb/include
 OUTPUT_TYPE = SHARED_LIBRARY
 PRIVATE_DEPENDENCIES = LIBTALLOC
 SUBSYSTEM = LIBLDB
-OBJ_FILES = \
-		instancetype.o
 # End MODULE ldb_instancetype
 ################################################
 
+ldb_instancetype_OBJ_FILES = dsdb/samdb/ldb_modules/instancetype.o
+