libds: share UF_ flags between samba3 and 4.

Guenther

17 files changed, 86 insertions, 169 deletions

diff --git a/source4/dsdb/common/flags.h b/libds/common/flags.h
index dd8081732c..2b342af8d6 100644
--- a/source4/dsdb/common/flags.h
+++ b/libds/common/flags.h
@@ -21,23 +21,23 @@
 /* UserFlags for userAccountControl */
 #define UF_SCRIPT	 			0x00000001  /* NT or Lan Manager Login script must be executed */
 #define UF_ACCOUNTDISABLE			0x00000002
-#define UF_00000004	 			0x00000004
+#define UF_00000004				0x00000004
 #define UF_HOMEDIR_REQUIRED			0x00000008
 
-#define UF_LOCKOUT	 			0x00000010
-#define UF_PASSWD_NOTREQD 			0x00000020
-#define UF_PASSWD_CANT_CHANGE 			0x00000040
+#define UF_LOCKOUT				0x00000010
+#define UF_PASSWD_NOTREQD			0x00000020
+#define UF_PASSWD_CANT_CHANGE			0x00000040
 #define UF_ENCRYPTED_TEXT_PASSWORD_ALLOWED	0x00000080
 
-#define UF_TEMP_DUPLICATE_ACCOUNT       	0x00000100 /* Local user account in usrmgr */
-#define UF_NORMAL_ACCOUNT               	0x00000200
-#define UF_00000400	 			0x00000400
-#define UF_INTERDOMAIN_TRUST_ACCOUNT    	0x00000800
+#define UF_TEMP_DUPLICATE_ACCOUNT		0x00000100 /* Local user account in usrmgr */
+#define UF_NORMAL_ACCOUNT			0x00000200
+#define UF_00000400				0x00000400
+#define UF_INTERDOMAIN_TRUST_ACCOUNT		0x00000800
 
-#define UF_WORKSTATION_TRUST_ACCOUNT    	0x00001000
-#define UF_SERVER_TRUST_ACCOUNT         	0x00002000
-#define UF_00004000	 			0x00004000
-#define UF_00008000	 			0x00008000
+#define UF_WORKSTATION_TRUST_ACCOUNT		0x00001000
+#define UF_SERVER_TRUST_ACCOUNT			0x00002000
+#define UF_00004000				0x00004000
+#define UF_00008000				0x00008000
 
 #define UF_DONT_EXPIRE_PASSWD			0x00010000
 #define UF_MNS_LOGON_ACCOUNT			0x00020000
@@ -50,21 +50,53 @@
 #define UF_PASSWORD_EXPIRED			0x00800000
 
 #define UF_TRUSTED_TO_AUTHENTICATE_FOR_DELEGATION 0x01000000
-#define UF_NO_AUTH_DATA_REQUIRED                0x02000000
+#define UF_NO_AUTH_DATA_REQUIRED		0x02000000
+
+#define UF_MACHINE_ACCOUNT_MASK (\
+		UF_INTERDOMAIN_TRUST_ACCOUNT |\
+		UF_WORKSTATION_TRUST_ACCOUNT |\
+		UF_SERVER_TRUST_ACCOUNT \
+		)
+
+#define UF_ACCOUNT_TYPE_MASK (\
+		UF_TEMP_DUPLICATE_ACCOUNT |\
+		UF_NORMAL_ACCOUNT |\
+		UF_INTERDOMAIN_TRUST_ACCOUNT |\
+		UF_WORKSTATION_TRUST_ACCOUNT |\
+		UF_SERVER_TRUST_ACCOUNT \
+                )
+
+#define UF_SETTABLE_BITS (\
+		UF_SCRIPT |\
+		UF_ACCOUNTDISABLE |\
+		UF_HOMEDIR_REQUIRED  |\
+		UF_LOCKOUT |\
+		UF_PASSWD_NOTREQD |\
+		UF_PASSWD_CANT_CHANGE |\
+		UF_ACCOUNT_TYPE_MASK | \
+		UF_DONT_EXPIRE_PASSWD | \
+		UF_MNS_LOGON_ACCOUNT |\
+		UF_ENCRYPTED_TEXT_PASSWORD_ALLOWED |\
+		UF_SMARTCARD_REQUIRED |\
+		UF_TRUSTED_FOR_DELEGATION |\
+		UF_NOT_DELEGATED |\
+		UF_USE_DES_KEY_ONLY  |\
+		UF_DONT_REQUIRE_PREAUTH \
+		)
 
 /* sAMAccountType */
 #define ATYPE_NORMAL_ACCOUNT			0x30000000 /* 805306368 */
 #define ATYPE_WORKSTATION_TRUST			0x30000001 /* 805306369 */
-#define ATYPE_INTERDOMAIN_TRUST			0x30000002 /* 805306370 */ 
+#define ATYPE_INTERDOMAIN_TRUST			0x30000002 /* 805306370 */
 #define ATYPE_SECURITY_GLOBAL_GROUP		0x10000000 /* 268435456 */
 #define ATYPE_DISTRIBUTION_GLOBAL_GROUP		0x10000001 /* 268435457 */
-#define ATYPE_DISTRIBUTION_UNIVERSAL_GROUP 	ATYPE_DISTRIBUTION_GLOBAL_GROUP
+#define ATYPE_DISTRIBUTION_UNIVERSAL_GROUP	ATYPE_DISTRIBUTION_GLOBAL_GROUP
 #define ATYPE_SECURITY_LOCAL_GROUP		0x20000000 /* 536870912 */
 #define ATYPE_DISTRIBUTION_LOCAL_GROUP		0x20000001 /* 536870913 */
 
-#define ATYPE_ACCOUNT		ATYPE_NORMAL_ACCOUNT 		/* 0x30000000 805306368 */
-#define ATYPE_GLOBAL_GROUP	ATYPE_SECURITY_GLOBAL_GROUP 	/* 0x10000000 268435456 */
-#define ATYPE_LOCAL_GROUP	ATYPE_SECURITY_LOCAL_GROUP 	/* 0x20000000 536870912 */
+#define ATYPE_ACCOUNT		ATYPE_NORMAL_ACCOUNT		/* 0x30000000 805306368 */
+#define ATYPE_GLOBAL_GROUP	ATYPE_SECURITY_GLOBAL_GROUP	/* 0x10000000 268435456 */
+#define ATYPE_LOCAL_GROUP	ATYPE_SECURITY_LOCAL_GROUP	/* 0x20000000 536870912 */
 
 /* groupType */
 #define GROUP_TYPE_BUILTIN_LOCAL_GROUP		0x00000001
@@ -111,7 +143,7 @@
 #define SYSTEM_FLAG_CR_NTDS_DOMAIN		0x00000002
 #define SYSTEM_FLAG_CR_NTDS_NOT_GC_REPLICATED	0x00000004
 #define SYSTEM_FLAG_SCHEMA_BASE_OBJECT		0x00000010
-#define SYSTEM_FLAG_ATTR_IS_RDN		        0x00000020
+#define SYSTEM_FLAG_ATTR_IS_RDN			0x00000020
 #define SYSTEM_FLAG_DISALLOW_MOVE_ON_DELETE	0x02000000
 #define SYSTEM_FLAG_DOMAIN_DISALLOW_MOVE	0x04000000
 #define SYSTEM_FLAG_DOMAIN_DISALLOW_RENAME	0x08000000
@@ -120,18 +152,26 @@
 #define SYSTEM_FLAG_CONFIG_ALLOW_RENAME		0x40000000
 #define SYSTEM_FLAG_DISALLOW_DELTE		0x80000000
 
-#define SEARCH_FLAG_ATTINDEX            0x0000001
-#define SEARCH_FLAG_PDNTATTINDEX        0x0000002
-#define SEARCH_FLAG_ANR                 0x0000004
-#define SEARCH_FLAG_PRESERVEONDELETE    0x0000008
-#define SEARCH_FLAG_COPY                0x0000010
-#define SEARCH_FLAG_TUPLEINDEX          0x0000020
-#define SEARCH_FLAG_SUBTREEATTRINDEX    0x0000040
-#define SEARCH_FLAG_CONFIDENTIAL        0x0000080
-#define SEARCH_FLAG_NEVERVALUEAUDIT     0x0000100
-#define SEARCH_FLAG_RODC_ATTRIBUTE      0x0000200
+#define SEARCH_FLAG_ATTINDEX		0x0000001
+#define SEARCH_FLAG_PDNTATTINDEX	0x0000002
+#define SEARCH_FLAG_ANR			0x0000004
+#define SEARCH_FLAG_PRESERVEONDELETE	0x0000008
+#define SEARCH_FLAG_COPY		0x0000010
+#define SEARCH_FLAG_TUPLEINDEX		0x0000020
+#define SEARCH_FLAG_SUBTREEATTRINDEX	0x0000040
+#define SEARCH_FLAG_CONFIDENTIAL	0x0000080
+#define SEARCH_FLAG_NEVERVALUEAUDIT	0x0000100
+#define SEARCH_FLAG_RODC_ATTRIBUTE	0x0000200
 
 #define DS_BEHAVIOR_WIN2000		0
 #define DS_BEHAVIOR_WIN2003_INTERIM	1
 #define DS_BEHAVIOR_WIN2003		2
 #define DS_BEHAVIOR_WIN2008		3
+
+/* Settings for the domainFunctionality attribute in the rootDSE */
+
+#define DS_DOMAIN_FUNCTION_2000		0
+#define DS_DOMAIN_FUCNTION_2003_MIXED	1
+#define DS_DOMAIN_FUNCTION_2003		2
+#define DS_DOMAIN_FUNCTION_2008		3
+
diff --git a/source3/include/ads.h b/source3/include/ads.h
index afa4e12175..9761d54086 100644
--- a/source3/include/ads.h
+++ b/source3/include/ads.h
@@ -6,6 +6,8 @@
   basically this is a wrapper around ldap
 */
 
+#include "../libds/common/flags.h"
+
 enum wb_posix_mapping {
 	WB_POSIX_MAP_UNKNOWN    = -1,
 	WB_POSIX_MAP_TEMPLATE 	= 0, 
@@ -202,124 +204,6 @@ typedef void **ADS_MODLIST;
 #define ADS_LDAP_MATCHING_RULE_BIT_AND	"1.2.840.113556.1.4.803"
 #define ADS_LDAP_MATCHING_RULE_BIT_OR	"1.2.840.113556.1.4.804"
 
-/* UserFlags for userAccountControl */
-#define UF_SCRIPT	 			0x00000001
-#define UF_ACCOUNTDISABLE			0x00000002
-#define UF_UNUSED_1	 			0x00000004
-#define UF_HOMEDIR_REQUIRED			0x00000008
-
-#define UF_LOCKOUT	 			0x00000010
-#define UF_PASSWD_NOTREQD 			0x00000020
-#define UF_PASSWD_CANT_CHANGE 			0x00000040
-#define UF_ENCRYPTED_TEXT_PASSWORD_ALLOWED	0x00000080
-
-#define UF_TEMP_DUPLICATE_ACCOUNT       	0x00000100
-#define UF_NORMAL_ACCOUNT               	0x00000200
-#define UF_UNUSED_2	 			0x00000400
-#define UF_INTERDOMAIN_TRUST_ACCOUNT    	0x00000800
-
-#define UF_WORKSTATION_TRUST_ACCOUNT    	0x00001000
-#define UF_SERVER_TRUST_ACCOUNT         	0x00002000
-#define UF_UNUSED_3	 			0x00004000
-#define UF_UNUSED_4	 			0x00008000
-
-#define UF_DONT_EXPIRE_PASSWD			0x00010000
-#define UF_MNS_LOGON_ACCOUNT			0x00020000
-#define UF_SMARTCARD_REQUIRED			0x00040000
-#define UF_TRUSTED_FOR_DELEGATION		0x00080000
-
-#define UF_NOT_DELEGATED			0x00100000
-#define UF_USE_DES_KEY_ONLY			0x00200000
-#define UF_DONT_REQUIRE_PREAUTH			0x00400000
-#define UF_PASSWORD_EXPIRED			0x00800000
-
-#define UF_TRUSTED_TO_AUTHENTICATE_FOR_DELEGATION 0x01000000
-#define UF_NO_AUTH_DATA_REQUIRED		0x02000000
-#define UF_UNUSED_8				0x04000000
-#define UF_UNUSED_9				0x08000000
-
-#define UF_UNUSED_10				0x10000000
-#define UF_UNUSED_11				0x20000000
-#define UF_UNUSED_12				0x40000000
-#define UF_UNUSED_13				0x80000000
-
-#define UF_MACHINE_ACCOUNT_MASK (\
-		UF_INTERDOMAIN_TRUST_ACCOUNT |\
-		UF_WORKSTATION_TRUST_ACCOUNT |\
-		UF_SERVER_TRUST_ACCOUNT \
-		)
-
-#define UF_ACCOUNT_TYPE_MASK (\
-		UF_TEMP_DUPLICATE_ACCOUNT |\
-		UF_NORMAL_ACCOUNT |\
-		UF_INTERDOMAIN_TRUST_ACCOUNT |\
-		UF_WORKSTATION_TRUST_ACCOUNT |\
-		UF_SERVER_TRUST_ACCOUNT \
-                )
-
-#define UF_SETTABLE_BITS (\
-		UF_SCRIPT |\
-		UF_ACCOUNTDISABLE |\
-		UF_HOMEDIR_REQUIRED  |\
-		UF_LOCKOUT |\
-		UF_PASSWD_NOTREQD |\
-		UF_PASSWD_CANT_CHANGE |\
-		UF_ACCOUNT_TYPE_MASK | \
-		UF_DONT_EXPIRE_PASSWD | \
-		UF_MNS_LOGON_ACCOUNT |\
-		UF_ENCRYPTED_TEXT_PASSWORD_ALLOWED |\
-		UF_SMARTCARD_REQUIRED |\
-		UF_TRUSTED_FOR_DELEGATION |\
-		UF_NOT_DELEGATED |\
-		UF_USE_DES_KEY_ONLY  |\
-		UF_DONT_REQUIRE_PREAUTH \
-		)
-
-/* sAMAccountType */
-#define ATYPE_NORMAL_ACCOUNT			0x30000000 /* 805306368 */
-#define ATYPE_WORKSTATION_TRUST			0x30000001 /* 805306369 */
-#define ATYPE_INTERDOMAIN_TRUST			0x30000002 /* 805306370 */ 
-#define ATYPE_SECURITY_GLOBAL_GROUP		0x10000000 /* 268435456 */
-#define ATYPE_DISTRIBUTION_GLOBAL_GROUP		0x10000001 /* 268435457 */
-#define ATYPE_DISTRIBUTION_UNIVERSAL_GROUP 	ATYPE_DISTRIBUTION_GLOBAL_GROUP
-#define ATYPE_SECURITY_LOCAL_GROUP		0x20000000 /* 536870912 */
-#define ATYPE_DISTRIBUTION_LOCAL_GROUP		0x20000001 /* 536870913 */
-
-#define ATYPE_ACCOUNT		ATYPE_NORMAL_ACCOUNT 		/* 0x30000000 805306368 */
-#define ATYPE_GLOBAL_GROUP	ATYPE_SECURITY_GLOBAL_GROUP 	/* 0x10000000 268435456 */
-#define ATYPE_LOCAL_GROUP	ATYPE_SECURITY_LOCAL_GROUP 	/* 0x20000000 536870912 */
-
-/* groupType */
-#define GROUP_TYPE_BUILTIN_LOCAL_GROUP		0x00000001
-#define GROUP_TYPE_ACCOUNT_GROUP		0x00000002
-#define GROUP_TYPE_RESOURCE_GROUP		0x00000004
-#define GROUP_TYPE_UNIVERSAL_GROUP		0x00000008
-#define GROUP_TYPE_APP_BASIC_GROUP		0x00000010
-#define GROUP_TYPE_APP_QUERY_GROUP		0x00000020
-#define GROUP_TYPE_SECURITY_ENABLED		0x80000000
-
-#define GTYPE_SECURITY_BUILTIN_LOCAL_GROUP ( 	/* 0x80000005 -2147483643 */ \
-		GROUP_TYPE_BUILTIN_LOCAL_GROUP| \
-		GROUP_TYPE_RESOURCE_GROUP| \
-		GROUP_TYPE_SECURITY_ENABLED \
-		)
-#define GTYPE_SECURITY_DOMAIN_LOCAL_GROUP ( 	/* 0x80000004 -2147483644 */ \
-		GROUP_TYPE_RESOURCE_GROUP| \
-		GROUP_TYPE_SECURITY_ENABLED \
-		)
-#define GTYPE_SECURITY_GLOBAL_GROUP ( 		/* 0x80000002 -2147483646 */ \
-		GROUP_TYPE_ACCOUNT_GROUP| \
-		GROUP_TYPE_SECURITY_ENABLED \
-		)
-#define GTYPE_SECURITY_UNIVERSAL_GROUP (	/* 0x80000008 -2147483656 */ \
-		GROUP_TYPE_UNIVERSAL_GROUP| \
-		GROUP_TYPE_SECURITY_ENABLED \
-		)
-
-#define GTYPE_DISTRIBUTION_GLOBAL_GROUP		0x00000002	/* 2 */
-#define GTYPE_DISTRIBUTION_DOMAIN_LOCAL_GROUP	0x00000004	/* 4 */
-#define GTYPE_DISTRIBUTION_UNIVERSAL_GROUP	0x00000008	/* 8 */
-
 #define ADS_PINGS          0x0000FFFF  /* Ping response */
 #define ADS_DNS_CONTROLLER 0x20000000  /* DomainControllerName is a DNS name*/
 #define ADS_DNS_DOMAIN     0x40000000  /* DomainName is a DNS name */
@@ -411,11 +295,4 @@ typedef struct {
 
 #define ADS_IGNORE_PRINCIPAL "not_defined_in_RFC4178@please_ignore"
 
-/* Settings for the domainFunctionality attribute in the rootDSE */
-
-#define DS_DOMAIN_FUNCTION_2000		0
-#define DS_DOMAIN_FUCNTION_2003_MIXED	1
-#define DS_DOMAIN_FUNCTION_2003		2
-#define DS_DOMAIN_FUNCTION_2008		3
-
 #endif	/* _INCLUDE_ADS_H_ */
diff --git a/source4/dsdb/common/flag_mapping.c b/source4/dsdb/common/flag_mapping.c
index dceb41be67..af284c41e7 100644
--- a/source4/dsdb/common/flag_mapping.c
+++ b/source4/dsdb/common/flag_mapping.c
@@ -21,7 +21,7 @@
 
 #include "includes.h"
 #include "librpc/gen_ndr/samr.h"
-#include "dsdb/common/flags.h"
+#include "../libds/common/flags.h"
 #include "lib/ldb/include/ldb.h"
 #include "dsdb/common/proto.h"
 
diff --git a/source4/dsdb/common/sidmap.c b/source4/dsdb/common/sidmap.c
index 5c20149384..a2aa717ace 100644
--- a/source4/dsdb/common/sidmap.c
+++ b/source4/dsdb/common/sidmap.c
@@ -21,7 +21,7 @@
 
 #include "includes.h"
 #include "system/passwd.h"
-#include "dsdb/common/flags.h"
+#include "../libds/common/flags.h"
 #include "dsdb/samdb/samdb.h"
 #include "auth/auth.h"
 #include "libcli/ldap/ldap_ndr.h"
diff --git a/source4/dsdb/common/util.c b/source4/dsdb/common/util.c
index cbae2ec24c..30669ebd5a 100644
--- a/source4/dsdb/common/util.c
+++ b/source4/dsdb/common/util.c
@@ -31,7 +31,7 @@
 #include "libcli/security/security.h"
 #include "librpc/gen_ndr/ndr_security.h"
 #include "librpc/gen_ndr/ndr_misc.h"
-#include "dsdb/common/flags.h"
+#include "../libds/common/flags.h"
 #include "dsdb/common/proto.h"
 #include "libcli/ldap/ldap_ndr.h"
 #include "param/param.h"
diff --git a/source4/dsdb/samdb/ldb_modules/instancetype.c b/source4/dsdb/samdb/ldb_modules/instancetype.c
index 8d648d6d82..f0d56ac627 100644
--- a/source4/dsdb/samdb/ldb_modules/instancetype.c
+++ b/source4/dsdb/samdb/ldb_modules/instancetype.c
@@ -38,7 +38,7 @@
 #include "ldb_module.h"
 #include "librpc/gen_ndr/ndr_misc.h"
 #include "dsdb/samdb/samdb.h"
-#include "dsdb/common/flags.h"
+#include "../libds/common/flags.h"
 
 struct it_context {
 	struct ldb_module *module;
diff --git a/source4/dsdb/samdb/ldb_modules/password_hash.c b/source4/dsdb/samdb/ldb_modules/password_hash.c
index 44b7ef91e9..a28ca1d568 100644
--- a/source4/dsdb/samdb/ldb_modules/password_hash.c
+++ b/source4/dsdb/samdb/ldb_modules/password_hash.c
@@ -42,7 +42,7 @@
 #include "auth/kerberos/kerberos.h"
 #include "system/time.h"
 #include "dsdb/samdb/samdb.h"
-#include "dsdb/common/flags.h"
+#include "../libds/common/flags.h"
 #include "dsdb/samdb/ldb_modules/password_modules.h"
 #include "librpc/ndr/libndr.h"
 #include "librpc/gen_ndr/ndr_drsblobs.h"
diff --git a/source4/dsdb/samdb/ldb_modules/repl_meta_data.c b/source4/dsdb/samdb/ldb_modules/repl_meta_data.c
index 41f4e8e7d5..53d6d0749c 100644
--- a/source4/dsdb/samdb/ldb_modules/repl_meta_data.c
+++ b/source4/dsdb/samdb/ldb_modules/repl_meta_data.c
@@ -41,7 +41,7 @@
 #include "includes.h"
 #include "ldb_module.h"
 #include "dsdb/samdb/samdb.h"
-#include "dsdb/common/flags.h"
+#include "../libds/common/flags.h"
 #include "librpc/gen_ndr/ndr_misc.h"
 #include "librpc/gen_ndr/ndr_drsuapi.h"
 #include "librpc/gen_ndr/ndr_drsblobs.h"
diff --git a/source4/dsdb/samdb/samdb.c b/source4/dsdb/samdb/samdb.c
index 851187380b..08e6e0d985 100644
--- a/source4/dsdb/samdb/samdb.c
+++ b/source4/dsdb/samdb/samdb.c
@@ -36,7 +36,7 @@
 #include "ldb_wrap.h"
 #include "../lib/util/util_ldb.h"
 #include "dsdb/samdb/samdb.h"
-#include "dsdb/common/flags.h"
+#include "../libds/common/flags.h"
 #include "param/param.h"
 #include "lib/events/events.h"
 #include "auth/credentials/credentials.h"
diff --git a/source4/dsdb/samdb/samdb.h b/source4/dsdb/samdb/samdb.h
index 49dc14d74c..1493345b9d 100644
--- a/source4/dsdb/samdb/samdb.h
+++ b/source4/dsdb/samdb/samdb.h
@@ -38,7 +38,7 @@ struct tevent_context;
 #include "dsdb/schema/schema.h"
 #include "dsdb/samdb/samdb_proto.h"
 #include "dsdb/common/proto.h"
-#include "dsdb/common/flags.h"
+#include "../libds/common/flags.h"
 
 #define DSDB_CONTROL_CURRENT_PARTITION_OID "1.3.6.1.4.1.7165.4.3.2"
 struct dsdb_control_current_partition {
diff --git a/source4/kdc/hdb-samba4.c b/source4/kdc/hdb-samba4.c
index 7d731ab13d..84050edb7c 100644
--- a/source4/kdc/hdb-samba4.c
+++ b/source4/kdc/hdb-samba4.c
@@ -34,7 +34,7 @@
 
 #include "includes.h"
 #include "system/time.h"
-#include "dsdb/common/flags.h"
+#include "../libds/common/flags.h"
 #include "lib/ldb/include/ldb.h"
 #include "lib/ldb/include/ldb_errors.h"
 #include "librpc/gen_ndr/netlogon.h"
diff --git a/source4/kdc/pac-glue.c b/source4/kdc/pac-glue.c
index 5bd4cb10c7..21ae7091a6 100644
--- a/source4/kdc/pac-glue.c
+++ b/source4/kdc/pac-glue.c
@@ -21,7 +21,7 @@
 */
 
 #include "includes.h"
-#include "dsdb/common/flags.h"
+#include "../libds/common/flags.h"
 #include "lib/ldb/include/ldb.h"
 #include "librpc/gen_ndr/ndr_krb5pac.h"
 #include "librpc/gen_ndr/krb5pac.h"
diff --git a/source4/libnet/libnet_become_dc.c b/source4/libnet/libnet_become_dc.c
index dbbabd6a6d..b89e238a1c 100644
--- a/source4/libnet/libnet_become_dc.c
+++ b/source4/libnet/libnet_become_dc.c
@@ -25,7 +25,7 @@
 #include "lib/ldb/include/ldb_errors.h"
 #include "lib/ldb_wrap.h"
 #include "dsdb/samdb/samdb.h"
-#include "dsdb/common/flags.h"
+#include "../libds/common/flags.h"
 #include "librpc/gen_ndr/ndr_drsuapi_c.h"
 #include "libcli/security/security.h"
 #include "librpc/gen_ndr/ndr_misc.h"
diff --git a/source4/libnet/libnet_unbecome_dc.c b/source4/libnet/libnet_unbecome_dc.c
index e0e5e42115..3bd7a4e287 100644
--- a/source4/libnet/libnet_unbecome_dc.c
+++ b/source4/libnet/libnet_unbecome_dc.c
@@ -25,7 +25,7 @@
 #include "lib/ldb/include/ldb_errors.h"
 #include "lib/ldb_wrap.h"
 #include "dsdb/samdb/samdb.h"
-#include "dsdb/common/flags.h"
+#include "../libds/common/flags.h"
 #include "librpc/gen_ndr/ndr_drsuapi_c.h"
 #include "param/param.h"
 
diff --git a/source4/rpc_server/netlogon/dcerpc_netlogon.c b/source4/rpc_server/netlogon/dcerpc_netlogon.c
index dc2d078d6b..4d10d961f9 100644
--- a/source4/rpc_server/netlogon/dcerpc_netlogon.c
+++ b/source4/rpc_server/netlogon/dcerpc_netlogon.c
@@ -27,7 +27,7 @@
 #include "auth/auth.h"
 #include "auth/auth_sam_reply.h"
 #include "dsdb/samdb/samdb.h"
-#include "dsdb/common/flags.h"
+#include "../libds/common/flags.h"
 #include "rpc_server/samr/proto.h"
 #include "../lib/util/util_ldb.h"
 #include "libcli/auth/libcli_auth.h"
diff --git a/source4/rpc_server/samr/dcesrv_samr.c b/source4/rpc_server/samr/dcesrv_samr.c
index 03acf97cab..489247c1d0 100644
--- a/source4/rpc_server/samr/dcesrv_samr.c
+++ b/source4/rpc_server/samr/dcesrv_samr.c
@@ -29,7 +29,7 @@
 #include "system/time.h"
 #include "lib/ldb/include/ldb.h"
 #include "lib/ldb/include/ldb_errors.h"
-#include "dsdb/common/flags.h"
+#include "../libds/common/flags.h"
 #include "dsdb/samdb/samdb.h"
 #include "libcli/ldap/ldap_ndr.h"
 #include "libcli/security/security.h"
diff --git a/source4/rpc_server/samr/samr_password.c b/source4/rpc_server/samr/samr_password.c
index ec83cbfdc9..6f12d2f119 100644
--- a/source4/rpc_server/samr/samr_password.c
+++ b/source4/rpc_server/samr/samr_password.c
@@ -26,7 +26,7 @@
 #include "rpc_server/samr/dcesrv_samr.h"
 #include "system/time.h"
 #include "../lib/crypto/crypto.h"
-#include "dsdb/common/flags.h"
+#include "../libds/common/flags.h"
 #include "libcli/ldap/ldap.h"
 #include "dsdb/samdb/samdb.h"
 #include "auth/auth.h"