libds: share UF_ flags between samba3 and 4.

Guenther

1 files changed, 2 insertions, 125 deletions

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_ */