diff options
| author | Andrew Tridgell <tridge@samba.org> | 2009-09-17 15:24:20 -0700 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2009-09-17 15:24:20 -0700 |
| commit | 39971fff27f71b514308d10d7a2d8c3fb58c2420 (patch) | |
| tree | 101f2adac9ef41af17579d22f6ddd56ada62ce5d /libds | |
| parent | 23676b6e9e8aad0ac2aa78d04e65f637b4551527 (diff) | |
| parent | e71d9728f52e969e07927c5b38fa062c6ef6d1eb (diff) | |
| download | samba-39971fff27f71b514308d10d7a2d8c3fb58c2420.tar.gz samba-39971fff27f71b514308d10d7a2d8c3fb58c2420.tar.bz2 samba-39971fff27f71b514308d10d7a2d8c3fb58c2420.zip | |
Merge branch 'master' of /home/tridge/samba/git/combined
Diffstat (limited to 'libds')
| -rw-r--r-- | libds/common/flag_mapping.c | 11 | ||||
| -rw-r--r-- | libds/common/flags.h | 53 |
2 files changed, 36 insertions, 28 deletions
diff --git a/libds/common/flag_mapping.c b/libds/common/flag_mapping.c index dc7d80185a..429ccacb49 100644 --- a/libds/common/flag_mapping.c +++ b/libds/common/flag_mapping.c @@ -105,21 +105,24 @@ uint32_t ds_gtype2atype(uint32_t gtype) case GTYPE_SECURITY_BUILTIN_LOCAL_GROUP: atype = ATYPE_SECURITY_LOCAL_GROUP; break; + case GTYPE_SECURITY_GLOBAL_GROUP: + atype = ATYPE_SECURITY_GLOBAL_GROUP; + break; case GTYPE_SECURITY_DOMAIN_LOCAL_GROUP: atype = ATYPE_SECURITY_LOCAL_GROUP; break; - case GTYPE_SECURITY_GLOBAL_GROUP: - atype = ATYPE_SECURITY_GLOBAL_GROUP; + case GTYPE_SECURITY_UNIVERSAL_GROUP: + atype = ATYPE_SECURITY_UNIVERSAL_GROUP; break; case GTYPE_DISTRIBUTION_GLOBAL_GROUP: atype = ATYPE_DISTRIBUTION_GLOBAL_GROUP; break; case GTYPE_DISTRIBUTION_DOMAIN_LOCAL_GROUP: - atype = ATYPE_DISTRIBUTION_UNIVERSAL_GROUP; + atype = ATYPE_DISTRIBUTION_LOCAL_GROUP; break; case GTYPE_DISTRIBUTION_UNIVERSAL_GROUP: - atype = ATYPE_DISTRIBUTION_LOCAL_GROUP; + atype = ATYPE_DISTRIBUTION_UNIVERSAL_GROUP; break; } diff --git a/libds/common/flags.h b/libds/common/flags.h index 2b342af8d6..dfdd603a15 100644 --- a/libds/common/flags.h +++ b/libds/common/flags.h @@ -18,7 +18,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ -/* UserFlags for userAccountControl */ +/* User flags for "userAccountControl" */ #define UF_SCRIPT 0x00000001 /* NT or Lan Manager Login script must be executed */ #define UF_ACCOUNTDISABLE 0x00000002 #define UF_00000004 0x00000004 @@ -84,21 +84,7 @@ 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 */ +/* Group flags for "groupType" */ #define GROUP_TYPE_BUILTIN_LOCAL_GROUP 0x00000001 #define GROUP_TYPE_ACCOUNT_GROUP 0x00000002 #define GROUP_TYPE_RESOURCE_GROUP 0x00000004 @@ -132,6 +118,22 @@ #define GTYPE_DISTRIBUTION_DOMAIN_LOCAL_GROUP 0x00000004 /* 4 */ #define GTYPE_DISTRIBUTION_UNIVERSAL_GROUP 0x00000008 /* 8 */ +/* Account flags for "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_SECURITY_LOCAL_GROUP 0x20000000 /* 536870912 */ +#define ATYPE_SECURITY_UNIVERSAL_GROUP ATYPE_SECURITY_GLOBAL_GROUP +#define ATYPE_DISTRIBUTION_GLOBAL_GROUP 0x10000001 /* 268435457 */ +#define ATYPE_DISTRIBUTION_LOCAL_GROUP 0x20000001 /* 536870913 */ +#define ATYPE_DISTRIBUTION_UNIVERSAL_GROUP ATYPE_DISTRIBUTION_GLOBAL_GROUP + +#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 */ + +/* "instanceType" */ #define INSTANCE_TYPE_IS_NC_HEAD 0x00000001 #define INSTANCE_TYPE_UNINSTANT 0x00000002 #define INSTANCE_TYPE_WRITE 0x00000004 @@ -139,6 +141,7 @@ #define INSTANCE_TYPE_NC_COMING 0x00000010 #define INSTANCE_TYPE_NC_GOING 0x00000020 +/* "systemFlags" */ #define SYSTEM_FLAG_CR_NTDS_NC 0x00000001 #define SYSTEM_FLAG_CR_NTDS_DOMAIN 0x00000002 #define SYSTEM_FLAG_CR_NTDS_NOT_GC_REPLICATED 0x00000004 @@ -152,6 +155,7 @@ #define SYSTEM_FLAG_CONFIG_ALLOW_RENAME 0x40000000 #define SYSTEM_FLAG_DISALLOW_DELTE 0x80000000 +/* "searchFlags" */ #define SEARCH_FLAG_ATTINDEX 0x0000001 #define SEARCH_FLAG_PDNTATTINDEX 0x0000002 #define SEARCH_FLAG_ANR 0x0000004 @@ -163,15 +167,16 @@ #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 */ - +/* "domainFunctionality", "forestFunctionality" in the rootDSE */ #define DS_DOMAIN_FUNCTION_2000 0 -#define DS_DOMAIN_FUCNTION_2003_MIXED 1 +#define DS_DOMAIN_FUNCTION_2003_MIXED 1 #define DS_DOMAIN_FUNCTION_2003 2 #define DS_DOMAIN_FUNCTION_2008 3 +#define DS_DOMAIN_FUNCTION_2008_R2 4 + +/* "domainControllerFunctionality" in the rootDSE */ +#define DS_DC_FUNCTION_2000 0 +#define DS_DC_FUNCTION_2003 2 +#define DS_DC_FUNCTION_2008 3 +#define DS_DC_FUNCTION_2008_R2 4 |