Changeset 745 for trunk/server/libds/common/flag_mapping.c

Timestamp:

Nov 27, 2012, 4:43:17 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: updated trunk to 3.6.0

Location:

trunk/server

Files:

• . (modified) (1 prop)
• libds/common/flag_mapping.c (modified) (5 diffs)

trunk/server/libds/common/flag_mapping.c

@@ -5 +5 @@
    Copyright (C) Stefan (metze) Metzmacher 2002
    Copyright (C) Andrew Tridgell 2004
+   Copyright (C) Matthias Dieter Wallnöfer 2010
 
    This program is free software; you can redistribute it and/or modify
@@ -23 +24 @@
 #include "librpc/gen_ndr/samr.h"
 #include "../libds/common/flags.h"
+#include "flag_mapping.h"
 
 /*
@@ -50 +52 @@
         { UF_DONT_REQUIRE_PREAUTH, ACB_DONT_REQUIRE_PREAUTH },
         { UF_PASSWORD_EXPIRED, ACB_PW_EXPIRED },
-        { UF_NO_AUTH_DATA_REQUIRED, ACB_NO_AUTH_DATA_REQD }
+        { UF_NO_AUTH_DATA_REQUIRED, ACB_NO_AUTH_DATA_REQD },
+        { UF_TRUSTED_TO_AUTHENTICATE_FOR_DELEGATION, ACB_TRUSTED_TO_AUTHENTICATE_FOR_DELEGATION },
+        { UF_PARTIAL_SECRETS_ACCOUNT, ACB_PARTIAL_SECRETS_ACCOUNT },
+        { UF_USE_AES_KEYS, ACB_USE_AES_KEYS }
 };
 
 uint32_t ds_acb2uf(uint32_t acb)
 {
-        uint32_t i, ret = 0;
+        unsigned int i;
+        uint32_t ret = 0;
         for (i=0;i<ARRAY_SIZE(acct_flags_map);i++) {
                 if (acct_flags_map[i].acb & acb) {
@@ -69 +75 @@
 uint32_t ds_uf2acb(uint32_t uf)
 {
-        uint32_t i;
+        unsigned int i;
         uint32_t ret = 0;
         for (i=0;i<ARRAY_SIZE(acct_flags_map);i++) {
@@ -145 +151 @@
         return SID_NAME_UNKNOWN;
 }
+
+/* get the default primary group RID for a given userAccountControl
+ * (information according to MS-SAMR 3.1.1.8.1) */
+uint32_t ds_uf2prim_group_rid(uint32_t uf)
+{
+        uint32_t prim_group_rid = DOMAIN_RID_USERS;
+
+        if ((uf & UF_PARTIAL_SECRETS_ACCOUNT)
+         && (uf & UF_WORKSTATION_TRUST_ACCOUNT))    prim_group_rid = DOMAIN_RID_READONLY_DCS;
+        else if (uf & UF_SERVER_TRUST_ACCOUNT)      prim_group_rid = DOMAIN_RID_DCS;
+        else if (uf & UF_WORKSTATION_TRUST_ACCOUNT) prim_group_rid = DOMAIN_RID_DOMAIN_MEMBERS;
+
+        return prim_group_rid;
+}