dsdb: Fix includes when building against system ldb.

5 files changed, 45 insertions, 44 deletions

diff --git a/source4/dsdb/samdb/ldb_modules/descriptor.c b/source4/dsdb/samdb/ldb_modules/descriptor.c
index 08754eda44..ba60682f71 100644
--- a/source4/dsdb/samdb/ldb_modules/descriptor.c
+++ b/source4/dsdb/samdb/ldb_modules/descriptor.c
@@ -33,8 +33,8 @@
  */
 
 #include "includes.h"
-#include "ldb_module.h"
-#include "dlinklist.h"
+#include <ldb_module.h>
+#include "util/dlinklist.h"
 #include "dsdb/samdb/samdb.h"
 #include "librpc/ndr/libndr.h"
 #include "librpc/gen_ndr/ndr_security.h"
diff --git a/source4/dsdb/samdb/ldb_modules/linked_attributes.c b/source4/dsdb/samdb/ldb_modules/linked_attributes.c
index 56ed447771..876ada6d2c 100644
--- a/source4/dsdb/samdb/ldb_modules/linked_attributes.c
+++ b/source4/dsdb/samdb/ldb_modules/linked_attributes.c
@@ -30,7 +30,7 @@
 
 #include "includes.h"
 #include "ldb_module.h"
-#include "dlinklist.h"
+#include "util/dlinklist.h"
 #include "dsdb/samdb/samdb.h"
 #include "librpc/gen_ndr/ndr_misc.h"
 #include "dsdb/samdb/ldb_modules/util.h"
diff --git a/source4/dsdb/samdb/ldb_modules/objectclass.c b/source4/dsdb/samdb/ldb_modules/objectclass.c
index b15dff01f7..2df809701c 100644
--- a/source4/dsdb/samdb/ldb_modules/objectclass.c
+++ b/source4/dsdb/samdb/ldb_modules/objectclass.c
@@ -37,7 +37,7 @@
 
 #include "includes.h"
 #include "ldb_module.h"
-#include "dlinklist.h"
+#include "util/dlinklist.h"
 #include "dsdb/samdb/samdb.h"
 #include "librpc/ndr/libndr.h"
 #include "librpc/gen_ndr/ndr_security.h"
diff --git a/source4/dsdb/samdb/ldb_modules/operational.c b/source4/dsdb/samdb/ldb_modules/operational.c
index 42cbea7449..a4cf49db3a 100644
--- a/source4/dsdb/samdb/ldb_modules/operational.c
+++ b/source4/dsdb/samdb/ldb_modules/operational.c
@@ -64,8 +64,8 @@
 */
 
 #include "includes.h"
-#include "ldb_includes.h"
-#include "ldb_module.h"
+#include <ldb.h>
+#include <ldb_module.h>
 
 #include "librpc/gen_ndr/ndr_misc.h"
 #include "librpc/gen_ndr/ndr_drsblobs.h"
diff --git a/source4/dsdb/samdb/ldb_modules/wscript_build b/source4/dsdb/samdb/ldb_modules/wscript_build
index 3d04c73ecc..cf53bcb2ab 100644
--- a/source4/dsdb/samdb/ldb_modules/wscript_build
+++ b/source4/dsdb/samdb/ldb_modules/wscript_build
@@ -9,7 +9,7 @@ bld.SAMBA_SUBSYSTEM('DSDB_MODULE_HELPERS',
 
 bld.SAMBA_MODULE('ldb_samba_dsdb',
 	source='samba_dsdb.c',
-	subsystem='LIBLDB',
+	subsystem='ldb',
 	init_function='LDB_MODULE(samba_dsdb)',
 	deps='SAMDB talloc LIBEVENTS LIBNDR DSDB_MODULE_HELPERS',
 	internal_module=not bld.CONFIG_SET('USING_SYSTEM_LDB'),
@@ -18,7 +18,7 @@ bld.SAMBA_MODULE('ldb_samba_dsdb',
 
 bld.SAMBA_MODULE('ldb_samba_secrets',
 	source='samba_secrets.c',
-	subsystem='LIBLDB',
+	subsystem='ldb',
 	init_function='LDB_MODULE(samba_secrets)',
 	internal_module=not bld.CONFIG_SET('USING_SYSTEM_LDB'),
 	deps='SAMDB talloc LIBEVENTS LIBNDR'
@@ -27,7 +27,7 @@ bld.SAMBA_MODULE('ldb_samba_secrets',
 
 bld.SAMBA_MODULE('ldb_objectguid',
 	source='objectguid.c',
-	subsystem='LIBLDB',
+	subsystem='ldb',
 	init_function='LDB_MODULE(objectguid)',
 	internal_module=not bld.CONFIG_SET('USING_SYSTEM_LDB'),
 	deps='SAMDB talloc LIBEVENTS LIBNDR'
@@ -36,7 +36,7 @@ bld.SAMBA_MODULE('ldb_objectguid',
 
 bld.SAMBA_MODULE('ldb_repl_meta_data',
 	source='repl_meta_data.c',
-	subsystem='LIBLDB',
+	subsystem='ldb',
 	init_function='LDB_MODULE(repl_meta_data)',
 	internal_module=not bld.CONFIG_SET('USING_SYSTEM_LDB'),
 	deps='SAMDB talloc LIBEVENTS LIBNDR NDR_DRSUAPI NDR_DRSBLOBS LIBNDR DSDB_MODULE_HELPERS'
@@ -45,7 +45,7 @@ bld.SAMBA_MODULE('ldb_repl_meta_data',
 
 bld.SAMBA_MODULE('ldb_dsdb_cache',
 	source='dsdb_cache.c',
-	subsystem='LIBLDB',
+	subsystem='ldb',
 	init_function='LDB_MODULE(dsdb_cache)',
 	internal_module=not bld.CONFIG_SET('USING_SYSTEM_LDB'),
 	deps='SAMDB talloc LIBEVENTS'
@@ -54,7 +54,7 @@ bld.SAMBA_MODULE('ldb_dsdb_cache',
 
 bld.SAMBA_MODULE('ldb_schema_load',
 	source='schema_load.c',
-	subsystem='LIBLDB',
+	subsystem='ldb',
 	init_function='LDB_MODULE(schema_load)',
 	internal_module=not bld.CONFIG_SET('USING_SYSTEM_LDB'),
 	deps='SAMDB talloc LIBEVENTS DSDB_MODULE_HELPERS'
@@ -63,7 +63,7 @@ bld.SAMBA_MODULE('ldb_schema_load',
 
 bld.SAMBA_MODULE('ldb_schema_data',
 	source='schema_data.c',
-	subsystem='LIBLDB',
+	subsystem='ldb',
 	init_function='LDB_MODULE(schema_data)',
 	internal_module=not bld.CONFIG_SET('USING_SYSTEM_LDB'),
 	deps='SAMDB talloc LIBEVENTS DSDB_MODULE_HELPERS'
@@ -72,7 +72,7 @@ bld.SAMBA_MODULE('ldb_schema_data',
 
 bld.SAMBA_MODULE('ldb_naming_fsmo',
 	source='naming_fsmo.c',
-	subsystem='LIBLDB',
+	subsystem='ldb',
 	init_function='LDB_MODULE(naming_fsmo)',
 	internal_module=not bld.CONFIG_SET('USING_SYSTEM_LDB'),
 	deps='SAMDB talloc LIBEVENTS DSDB_MODULE_HELPERS'
@@ -81,7 +81,7 @@ bld.SAMBA_MODULE('ldb_naming_fsmo',
 
 bld.SAMBA_MODULE('ldb_pdc_fsmo',
 	source='pdc_fsmo.c',
-	subsystem='LIBLDB',
+	subsystem='ldb',
 	init_function='LDB_MODULE(pdc_fsmo)',
 	internal_module=not bld.CONFIG_SET('USING_SYSTEM_LDB'),
 	deps='SAMDB talloc LIBEVENTS DSDB_MODULE_HELPERS'
@@ -90,7 +90,7 @@ bld.SAMBA_MODULE('ldb_pdc_fsmo',
 
 bld.SAMBA_MODULE('ldb_samldb',
 	source='samldb.c',
-	subsystem='LIBLDB',
+	subsystem='ldb',
 	init_function='LDB_MODULE(samldb)',
 	internal_module=not bld.CONFIG_SET('USING_SYSTEM_LDB'),
 	deps='talloc LIBEVENTS SAMDB DSDB_MODULE_HELPERS'
@@ -99,7 +99,7 @@ bld.SAMBA_MODULE('ldb_samldb',
 
 bld.SAMBA_MODULE('ldb_samba3sam',
 	source='samba3sam.c',
-	subsystem='LIBLDB',
+	subsystem='ldb',
 	init_function='LDB_MODULE(samba3sam)',
 	internal_module=not bld.CONFIG_SET('USING_SYSTEM_LDB'),
 	deps='talloc LIBEVENTS ldb SMBPASSWD NSS_WRAPPER LIBSECURITY NDR_SECURITY'
@@ -108,7 +108,7 @@ bld.SAMBA_MODULE('ldb_samba3sam',
 
 bld.SAMBA_MODULE('ldb_samba3sid',
 	source='samba3sid.c',
-	subsystem='LIBLDB',
+	subsystem='ldb',
 	init_function='LDB_MODULE(samba3sid)',
 	internal_module=not bld.CONFIG_SET('USING_SYSTEM_LDB'),
 	deps='talloc LIBEVENTS ldb SMBPASSWD NSS_WRAPPER LIBSECURITY NDR_SECURITY'
@@ -118,7 +118,7 @@ bld.SAMBA_MODULE('ldb_samba3sid',
 bld.SAMBA_MODULE('ldb_simple_ldap_map',
 	source='simple_ldap_map.c',
 	aliases='entryuuid nsuniqueid',
-	subsystem='LIBLDB',
+	subsystem='ldb',
 	init_function='LDB_MODULE(entryuuid),LDB_MODULE(nsuniqueid)',
 	internal_module=not bld.CONFIG_SET('USING_SYSTEM_LDB'),
 	deps='talloc LIBEVENTS ldb LIBNDR'
@@ -127,7 +127,7 @@ bld.SAMBA_MODULE('ldb_simple_ldap_map',
 
 bld.SAMBA_MODULE('ldb_rootdse',
 	source='rootdse.c',
-	subsystem='LIBLDB',
+	subsystem='ldb',
 	init_function='LDB_MODULE(rootdse)',
 	internal_module=not bld.CONFIG_SET('USING_SYSTEM_LDB'),
 	deps='talloc LIBEVENTS SAMDB'
@@ -136,7 +136,7 @@ bld.SAMBA_MODULE('ldb_rootdse',
 
 bld.SAMBA_MODULE('ldb_password_hash',
 	source='password_hash.c',
-	subsystem='LIBLDB',
+	subsystem='ldb',
 	init_function='LDB_MODULE(password_hash)',
 	internal_module=not bld.CONFIG_SET('USING_SYSTEM_LDB'),
 	deps='talloc LIBEVENTS SAMDB LIBCLI_AUTH NDR_DRSBLOBS KERBEROS HEIMDAL_HDB_KEYS HEIMDAL_KRB5'
@@ -145,7 +145,7 @@ bld.SAMBA_MODULE('ldb_password_hash',
 
 bld.SAMBA_MODULE('ldb_local_password',
 	source='local_password.c',
-	subsystem='LIBLDB',
+	subsystem='ldb',
 	init_function='LDB_MODULE(local_password)',
 	internal_module=not bld.CONFIG_SET('USING_SYSTEM_LDB'),
 	deps='talloc LIBEVENTS LIBNDR SAMDB'
@@ -154,7 +154,7 @@ bld.SAMBA_MODULE('ldb_local_password',
 
 bld.SAMBA_MODULE('ldb_kludge_acl',
 	source='kludge_acl.c',
-	subsystem='LIBLDB',
+	subsystem='ldb',
 	init_function='LDB_MODULE(kludge_acl)',
 	internal_module=not bld.CONFIG_SET('USING_SYSTEM_LDB'),
 	deps='talloc LIBEVENTS LIBSECURITY SAMDB'
@@ -163,7 +163,7 @@ bld.SAMBA_MODULE('ldb_kludge_acl',
 
 bld.SAMBA_MODULE('ldb_extended_dn_in',
 	source='extended_dn_in.c',
-	subsystem='LIBLDB',
+	subsystem='ldb',
 	init_function='LDB_MODULE(extended_dn_in)',
 	internal_module=not bld.CONFIG_SET('USING_SYSTEM_LDB'),
 	deps='talloc LIBEVENTS LIBSAMBA-UTIL'
@@ -173,7 +173,7 @@ bld.SAMBA_MODULE('ldb_extended_dn_in',
 bld.SAMBA_MODULE('ldb_extended_dn_out',
 	source='extended_dn_out.c',
 	aliases='extended_dn_out_ldb extended_dn_out_openldap extended_dn_out_fds',
-	subsystem='LIBLDB',
+	subsystem='ldb',
 	deps='talloc LIBEVENTS LIBNDR LIBSAMBA-UTIL SAMDB',
 	internal_module=not bld.CONFIG_SET('USING_SYSTEM_LDB'),
 	init_function='LDB_MODULE(extended_dn_out_ldb),LDB_MODULE(extended_dn_out_openldap),LDB_MODULE(extended_dn_out_fds)'
@@ -182,7 +182,7 @@ bld.SAMBA_MODULE('ldb_extended_dn_out',
 
 bld.SAMBA_MODULE('ldb_extended_dn_store',
 	source='extended_dn_store.c',
-	subsystem='LIBLDB',
+	subsystem='ldb',
 	init_function='LDB_MODULE(extended_dn_store)',
 	internal_module=not bld.CONFIG_SET('USING_SYSTEM_LDB'),
 	deps='talloc LIBEVENTS LIBSAMBA-UTIL SAMDB DSDB_MODULE_HELPERS'
@@ -191,7 +191,7 @@ bld.SAMBA_MODULE('ldb_extended_dn_store',
 
 bld.SAMBA_MODULE('ldb_show_deleted',
 	source='show_deleted.c',
-	subsystem='LIBLDB',
+	subsystem='ldb',
 	init_function='LDB_MODULE(show_deleted)',
 	internal_module=not bld.CONFIG_SET('USING_SYSTEM_LDB'),
 	deps='talloc LIBEVENTS LIBSAMBA-UTIL'
@@ -201,7 +201,7 @@ bld.SAMBA_MODULE('ldb_show_deleted',
 bld.SAMBA_MODULE('ldb_partition',
 	source='partition.c partition_init.c',
 	autoproto='partition_proto.h',
-	subsystem='LIBLDB',
+	subsystem='ldb',
 	init_function='LDB_MODULE(partition)',
 	internal_module=not bld.CONFIG_SET('USING_SYSTEM_LDB'),
 	deps='talloc LIBEVENTS SAMDB DSDB_MODULE_HELPERS'
@@ -210,7 +210,7 @@ bld.SAMBA_MODULE('ldb_partition',
 
 bld.SAMBA_MODULE('ldb_new_partition',
 	source='new_partition.c',
-	subsystem='LIBLDB',
+	subsystem='ldb',
 	init_function='LDB_MODULE(new_partition)',
 	internal_module=not bld.CONFIG_SET('USING_SYSTEM_LDB'),
 	deps='talloc LIBEVENTS SAMDB DSDB_MODULE_HELPERS'
@@ -219,7 +219,7 @@ bld.SAMBA_MODULE('ldb_new_partition',
 
 bld.SAMBA_MODULE('ldb_update_keytab',
 	source='update_keytab.c',
-	subsystem='LIBLDB',
+	subsystem='ldb',
 	init_function='LDB_MODULE(update_keytab)',
 	internal_module=not bld.CONFIG_SET('USING_SYSTEM_LDB'),
 	deps='talloc LIBEVENTS CREDENTIALS ldb'
@@ -228,7 +228,7 @@ bld.SAMBA_MODULE('ldb_update_keytab',
 
 bld.SAMBA_MODULE('ldb_objectclass',
 	source='objectclass.c',
-	subsystem='LIBLDB',
+	subsystem='ldb',
 	init_function='LDB_MODULE(objectclass)',
 	internal_module=not bld.CONFIG_SET('USING_SYSTEM_LDB'),
 	deps='talloc LIBEVENTS LIBSECURITY NDR_SECURITY SAMDB DSDB_MODULE_HELPERS LIBSAMBA-UTIL'
@@ -237,15 +237,16 @@ bld.SAMBA_MODULE('ldb_objectclass',
 
 bld.SAMBA_MODULE('ldb_objectclass_attrs',
 	source='objectclass_attrs.c',
-	subsystem='LIBLDB',
+	subsystem='ldb',
 	init_function='LDB_MODULE(objectclass_attrs)',
-	deps='talloc SAMDB LIBSAMBA-UTIL'
+	deps='talloc SAMDB LIBSAMBA-UTIL',
+	internal_module=not bld.CONFIG_SET('USING_SYSTEM_LDB'),
 	)
 
 
 bld.SAMBA_MODULE('ldb_subtree_rename',
 	source='subtree_rename.c',
-	subsystem='LIBLDB',
+	subsystem='ldb',
 	init_function='LDB_MODULE(subtree_rename)',
 	internal_module=not bld.CONFIG_SET('USING_SYSTEM_LDB'),
 	deps='talloc LIBEVENTS LIBSAMBA-UTIL ldb'
@@ -254,7 +255,7 @@ bld.SAMBA_MODULE('ldb_subtree_rename',
 
 bld.SAMBA_MODULE('ldb_subtree_delete',
 	source='subtree_delete.c',
-	subsystem='LIBLDB',
+	subsystem='ldb',
 	init_function='LDB_MODULE(subtree_delete)',
 	internal_module=not bld.CONFIG_SET('USING_SYSTEM_LDB'),
 	deps='talloc LIBEVENTS LIBSAMBA-UTIL DSDB_MODULE_HELPERS'
@@ -263,7 +264,7 @@ bld.SAMBA_MODULE('ldb_subtree_delete',
 
 bld.SAMBA_MODULE('ldb_linked_attributes',
 	source='linked_attributes.c',
-	subsystem='LIBLDB',
+	subsystem='ldb',
 	init_function='LDB_MODULE(linked_attributes)',
 	internal_module=not bld.CONFIG_SET('USING_SYSTEM_LDB'),
 	deps='talloc LIBEVENTS SAMDB DSDB_MODULE_HELPERS'
@@ -272,7 +273,7 @@ bld.SAMBA_MODULE('ldb_linked_attributes',
 
 bld.SAMBA_MODULE('ldb_ranged_results',
 	source='ranged_results.c',
-	subsystem='LIBLDB',
+	subsystem='ldb',
 	init_function='LDB_MODULE(ranged_results)',
 	internal_module=not bld.CONFIG_SET('USING_SYSTEM_LDB'),
 	deps='talloc LIBEVENTS LIBSAMBA-UTIL ldb'
@@ -281,7 +282,7 @@ bld.SAMBA_MODULE('ldb_ranged_results',
 
 bld.SAMBA_MODULE('ldb_anr',
 	source='anr.c',
-	subsystem='LIBLDB',
+	subsystem='ldb',
 	init_function='LDB_MODULE(anr)',
 	internal_module=not bld.CONFIG_SET('USING_SYSTEM_LDB'),
 	deps='talloc LIBEVENTS LIBSAMBA-UTIL SAMDB'
@@ -290,7 +291,7 @@ bld.SAMBA_MODULE('ldb_anr',
 
 bld.SAMBA_MODULE('ldb_instancetype',
 	source='instancetype.c',
-	subsystem='LIBLDB',
+	subsystem='ldb',
 	init_function='LDB_MODULE(instancetype)',
 	internal_module=not bld.CONFIG_SET('USING_SYSTEM_LDB'),
 	deps='talloc LIBEVENTS LIBSAMBA-UTIL SAMDB'
@@ -299,7 +300,7 @@ bld.SAMBA_MODULE('ldb_instancetype',
 
 bld.SAMBA_MODULE('ldb_operational',
 	source='operational.c',
-	subsystem='LIBLDB',
+	subsystem='ldb',
 	init_function='LDB_MODULE(operational)',
 	internal_module=not bld.CONFIG_SET('USING_SYSTEM_LDB'),
 	deps='talloc tevent LIBSAMBA-UTIL SAMDB_COMMON DSDB_MODULE_HELPERS auth auth_session'
@@ -308,7 +309,7 @@ bld.SAMBA_MODULE('ldb_operational',
 
 bld.SAMBA_MODULE('ldb_descriptor',
 	source='descriptor.c',
-	subsystem='LIBLDB',
+	subsystem='ldb',
 	init_function='LDB_MODULE(descriptor)',
 	internal_module=not bld.CONFIG_SET('USING_SYSTEM_LDB'),
 	deps='talloc LIBEVENTS LIBSECURITY NDR_SECURITY SAMDB DSDB_MODULE_HELPERS'
@@ -317,7 +318,7 @@ bld.SAMBA_MODULE('ldb_descriptor',
 
 bld.SAMBA_MODULE('ldb_resolve_oids',
 	source='resolve_oids.c',
-	subsystem='LIBLDB',
+	subsystem='ldb',
 	init_function='LDB_MODULE(resolve_oids)',
 	internal_module=not bld.CONFIG_SET('USING_SYSTEM_LDB'),
 	deps='SAMDB talloc LIBEVENTS LIBNDR'
@@ -326,7 +327,7 @@ bld.SAMBA_MODULE('ldb_resolve_oids',
 
 bld.SAMBA_MODULE('ldb_acl',
 	source='acl.c',
-	subsystem='LIBLDB',
+	subsystem='ldb',
 	init_function='LDB_MODULE(acl)',
 	internal_module=not bld.CONFIG_SET('USING_SYSTEM_LDB'),
 	deps='talloc LIBEVENTS LIBSECURITY SAMDB'
@@ -335,7 +336,7 @@ bld.SAMBA_MODULE('ldb_acl',
 
 bld.SAMBA_MODULE('ldb_lazy_commit',
 	source='lazy_commit.c',
-	subsystem='LIBLDB',
+	subsystem='ldb',
 	internal_module=not bld.CONFIG_SET('USING_SYSTEM_LDB'),
 	init_function='LDB_MODULE(lazy_commit)',
 	deps='SAMDB'