summaryrefslogtreecommitdiff
path: root/libds/common/flag_mapping.c
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2009-09-17 15:24:20 -0700
committerAndrew Tridgell <tridge@samba.org>2009-09-17 15:24:20 -0700
commit39971fff27f71b514308d10d7a2d8c3fb58c2420 (patch)
tree101f2adac9ef41af17579d22f6ddd56ada62ce5d /libds/common/flag_mapping.c
parent23676b6e9e8aad0ac2aa78d04e65f637b4551527 (diff)
parente71d9728f52e969e07927c5b38fa062c6ef6d1eb (diff)
downloadsamba-39971fff27f71b514308d10d7a2d8c3fb58c2420.tar.gz
samba-39971fff27f71b514308d10d7a2d8c3fb58c2420.tar.bz2
samba-39971fff27f71b514308d10d7a2d8c3fb58c2420.zip
Merge branch 'master' of /home/tridge/samba/git/combined
Diffstat (limited to 'libds/common/flag_mapping.c')
-rw-r--r--libds/common/flag_mapping.c11
1 files changed, 7 insertions, 4 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;
}