libds: merge the UF<->ACB flag mapping functions.
authorGünther Deschner <gd@samba.org>
Fri, 12 Jun 2009 13:20:48 +0000 (15:20 +0200)
committerGünther Deschner <gd@samba.org>
Mon, 13 Jul 2009 13:36:07 +0000 (15:36 +0200)
Guenther

14 files changed:
libds/common/flag_mapping.c [moved from source4/dsdb/common/flag_mapping.c with 89% similarity]
source3/Makefile.in
source3/include/proto.h
source3/lib/ads_flags.c [deleted file]
source3/lib/netapi/user.c
source3/passdb/pdb_ads.c
source3/winbindd/winbindd_ads.c
source4/cldap_server/netlogon.c
source4/dsdb/common/sidmap.c
source4/dsdb/common/util.c
source4/dsdb/config.mk
source4/dsdb/samdb/ldb_modules/samldb.c
source4/rpc_server/lsa/lsa_lookup.c
source4/rpc_server/samr/dcesrv_samr.c

similarity index 89%
rename from source4/dsdb/common/flag_mapping.c
rename to libds/common/flag_mapping.c
index af284c4..dc7d801 100644 (file)
@@ -1,20 +1,20 @@
-/* 
+/*
    Unix SMB/CIFS implementation.
-   helper mapping functions for the SAMDB server
-   
+   helper mapping functions for the UF and ACB flags
+
    Copyright (C) Stefan (metze) Metzmacher 2002
    Copyright (C) Andrew Tridgell 2004
-  
+
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
-   
+
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
-   
+
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "includes.h"
 #include "librpc/gen_ndr/samr.h"
 #include "../libds/common/flags.h"
-#include "lib/ldb/include/ldb.h"
-#include "dsdb/common/proto.h"
 
-/* 
-translated the ACB_CTRL Flags to UserFlags (userAccountControl) 
-*/ 
+/*
+translated the ACB_CTRL Flags to UserFlags (userAccountControl)
+*/
 /* mapping between ADS userAccountControl and SAMR acct_flags */
 static const struct {
        uint32_t uf;
@@ -54,7 +52,7 @@ static const struct {
        { UF_NO_AUTH_DATA_REQUIRED, ACB_NO_AUTH_DATA_REQD }
 };
 
-uint32_t samdb_acb2uf(uint32_t acb)
+uint32_t ds_acb2uf(uint32_t acb)
 {
        uint32_t i, ret = 0;
        for (i=0;i<ARRAY_SIZE(acct_flags_map);i++) {
@@ -68,7 +66,7 @@ uint32_t samdb_acb2uf(uint32_t acb)
 /*
 translated the UserFlags (userAccountControl) to ACB_CTRL Flags
 */
-uint32_t samdb_uf2acb(uint32_t uf)
+uint32_t ds_uf2acb(uint32_t uf)
 {
        uint32_t i;
        uint32_t ret = 0;
@@ -80,13 +78,13 @@ uint32_t samdb_uf2acb(uint32_t uf)
        return ret;
 }
 
-/* 
+/*
 get the accountType from the UserFlags
 */
-uint32_t samdb_uf2atype(uint32_t uf)
+uint32_t ds_uf2atype(uint32_t uf)
 {
        uint32_t atype = 0x00000000;
-               
+
        if (uf & UF_NORMAL_ACCOUNT)                     atype = ATYPE_NORMAL_ACCOUNT;
        else if (uf & UF_TEMP_DUPLICATE_ACCOUNT)        atype = ATYPE_NORMAL_ACCOUNT;
        else if (uf & UF_SERVER_TRUST_ACCOUNT)          atype = ATYPE_WORKSTATION_TRUST;
@@ -94,15 +92,15 @@ uint32_t samdb_uf2atype(uint32_t uf)
        else if (uf & UF_INTERDOMAIN_TRUST_ACCOUNT)     atype = ATYPE_INTERDOMAIN_TRUST;
 
        return atype;
-} 
+}
 
-/* 
+/*
 get the accountType from the groupType
 */
-uint32_t samdb_gtype2atype(uint32_t gtype)
+uint32_t ds_gtype2atype(uint32_t gtype)
 {
        uint32_t atype = 0x00000000;
-       
+
        switch(gtype) {
                case GTYPE_SECURITY_BUILTIN_LOCAL_GROUP:
                        atype = ATYPE_SECURITY_LOCAL_GROUP;
@@ -113,7 +111,7 @@ uint32_t samdb_gtype2atype(uint32_t gtype)
                case GTYPE_SECURITY_GLOBAL_GROUP:
                        atype = ATYPE_SECURITY_GLOBAL_GROUP;
                        break;
-       
+
                case GTYPE_DISTRIBUTION_GLOBAL_GROUP:
                        atype = ATYPE_DISTRIBUTION_GLOBAL_GROUP;
                        break;
@@ -129,7 +127,7 @@ uint32_t samdb_gtype2atype(uint32_t gtype)
 }
 
 /* turn a sAMAccountType into a SID_NAME_USE */
-enum lsa_SidType samdb_atype_map(uint32_t atype)
+enum lsa_SidType ds_atype_map(uint32_t atype)
 {
        switch (atype & 0xF0000000) {
        case ATYPE_GLOBAL_GROUP:
index 4c927e7..bc00f6a 100644 (file)
@@ -381,7 +381,7 @@ LIB_OBJ = $(LIBSAMBAUTIL_OBJ) $(UTIL_OBJ) $(CRYPTO_OBJ) \
          lib/interface.o lib/pidfile.o \
          lib/system.o lib/sendfile.o lib/recvfile.o lib/time.o \
          lib/username.o \
-         lib/ads_flags.o \
+         ../libds/common/flag_mapping.o \
          lib/util_pw.o lib/access.o lib/smbrun.o \
          lib/bitmap.o lib/dprintf.o $(UTIL_REG_OBJ) \
          lib/wins_srv.o \
index 27b5f45..44132b6 100644 (file)
@@ -1678,13 +1678,6 @@ ADS_STRUCT *ads_init(const char *realm,
                     const char *ldap_server);
 void ads_destroy(ADS_STRUCT **ads);
 
-/* The following definitions come from libads/ads_utils.c  */
-
-uint32 ads_acb2uf(uint32 acb);
-uint32 ads_uf2acb(uint32 uf);
-uint32 ads_uf2atype(uint32 uf);
-uint32 ads_gtype2atype(uint32 gtype);
-enum lsa_SidType ads_atype_map(uint32 atype);
 const char *ads_get_ldap_server_name(ADS_STRUCT *ads);
 
 /* The following definitions come from libads/authdata.c  */
@@ -7262,4 +7255,13 @@ NTSTATUS access_check_object( SEC_DESC *psd, NT_USER_TOKEN *token,
                                const char *debug);
 void map_max_allowed_access(const NT_USER_TOKEN *token,
                                uint32_t *pacc_requested);
+
+/* The following definitions come from ../libds/common/flag_mapping.c  */
+
+uint32_t ds_acb2uf(uint32_t acb);
+uint32_t ds_uf2acb(uint32_t uf);
+uint32_t ds_uf2atype(uint32_t uf);
+uint32_t ds_gtype2atype(uint32_t gtype);
+enum lsa_SidType ds_atype_map(uint32_t atype);
+
 #endif /*  _PROTO_H_  */
diff --git a/source3/lib/ads_flags.c b/source3/lib/ads_flags.c
deleted file mode 100644 (file)
index a8fa062..0000000
+++ /dev/null
@@ -1,150 +0,0 @@
-/*
-   Unix SMB/CIFS implementation.
-   ads (active directory) utility library
-
-   Copyright (C) Stefan (metze) Metzmacher 2002
-   Copyright (C) Andrew Tridgell 2001
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3 of the License, or
-   (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "includes.h"
-
-/*
-translated the ACB_CTRL Flags to UserFlags (userAccountControl)
-*/
-uint32 ads_acb2uf(uint32 acb)
-{
-       uint32 uf = 0x00000000;
-
-       if (acb & ACB_DISABLED)                 uf |= UF_ACCOUNTDISABLE;
-       if (acb & ACB_HOMDIRREQ)                uf |= UF_HOMEDIR_REQUIRED;
-       if (acb & ACB_PWNOTREQ)                 uf |= UF_PASSWD_NOTREQD;
-       if (acb & ACB_TEMPDUP)                  uf |= UF_TEMP_DUPLICATE_ACCOUNT;
-       if (acb & ACB_NORMAL)                   uf |= UF_NORMAL_ACCOUNT;
-       if (acb & ACB_MNS)                      uf |= UF_MNS_LOGON_ACCOUNT;
-       if (acb & ACB_DOMTRUST)                 uf |= UF_INTERDOMAIN_TRUST_ACCOUNT;
-       if (acb & ACB_WSTRUST)                  uf |= UF_WORKSTATION_TRUST_ACCOUNT;
-       if (acb & ACB_SVRTRUST)                 uf |= UF_SERVER_TRUST_ACCOUNT;
-       if (acb & ACB_PWNOEXP)                  uf |= UF_DONT_EXPIRE_PASSWD;
-       if (acb & ACB_AUTOLOCK)                 uf |= UF_LOCKOUT;
-       if (acb & ACB_USE_DES_KEY_ONLY)         uf |= UF_USE_DES_KEY_ONLY;
-       if (acb & ACB_SMARTCARD_REQUIRED)       uf |= UF_SMARTCARD_REQUIRED;
-       if (acb & ACB_TRUSTED_FOR_DELEGATION)   uf |= UF_TRUSTED_FOR_DELEGATION;
-       if (acb & ACB_DONT_REQUIRE_PREAUTH)     uf |= UF_DONT_REQUIRE_PREAUTH;
-       if (acb & ACB_NO_AUTH_DATA_REQD)        uf |= UF_NO_AUTH_DATA_REQUIRED;
-       if (acb & ACB_NOT_DELEGATED)            uf |= UF_NOT_DELEGATED;
-       if (acb & ACB_ENC_TXT_PWD_ALLOWED)      uf |= UF_ENCRYPTED_TEXT_PASSWORD_ALLOWED;
-
-       return uf;
-}
-
-/*
-translated the UserFlags (userAccountControl) to ACB_CTRL Flags
-*/
-uint32 ads_uf2acb(uint32 uf)
-{
-       uint32 acb = 0x00000000;
-
-       if (uf & UF_ACCOUNTDISABLE)             acb |= ACB_DISABLED;
-       if (uf & UF_HOMEDIR_REQUIRED)           acb |= ACB_HOMDIRREQ;
-       if (uf & UF_PASSWD_NOTREQD)             acb |= ACB_PWNOTREQ;
-       if (uf & UF_MNS_LOGON_ACCOUNT)          acb |= ACB_MNS;
-       if (uf & UF_DONT_EXPIRE_PASSWD)         acb |= ACB_PWNOEXP;
-       if (uf & UF_LOCKOUT)                    acb |= ACB_AUTOLOCK;
-       if (uf & UF_USE_DES_KEY_ONLY)           acb |= ACB_USE_DES_KEY_ONLY;
-       if (uf & UF_SMARTCARD_REQUIRED)         acb |= ACB_SMARTCARD_REQUIRED;
-       if (uf & UF_TRUSTED_FOR_DELEGATION)     acb |= ACB_TRUSTED_FOR_DELEGATION;
-       if (uf & UF_DONT_REQUIRE_PREAUTH)       acb |= ACB_DONT_REQUIRE_PREAUTH;
-       if (uf & UF_NO_AUTH_DATA_REQUIRED)      acb |= ACB_NO_AUTH_DATA_REQD;
-       if (uf & UF_NOT_DELEGATED)              acb |= ACB_NOT_DELEGATED;
-       if (uf & UF_ENCRYPTED_TEXT_PASSWORD_ALLOWED) acb |= ACB_ENC_TXT_PWD_ALLOWED;
-
-       switch (uf & UF_ACCOUNT_TYPE_MASK)
-       {
-               case UF_TEMP_DUPLICATE_ACCOUNT:         acb |= ACB_TEMPDUP;break;
-               case UF_NORMAL_ACCOUNT:                 acb |= ACB_NORMAL;break;
-               case UF_INTERDOMAIN_TRUST_ACCOUNT:      acb |= ACB_DOMTRUST;break;
-               case UF_WORKSTATION_TRUST_ACCOUNT:      acb |= ACB_WSTRUST;break;
-               case UF_SERVER_TRUST_ACCOUNT:           acb |= ACB_SVRTRUST;break;
-               /*Fix Me: what should we do here? */
-               default:                                acb |= ACB_NORMAL;break;
-       }
-
-       return acb;
-}
-
-/*
-get the accountType from the UserFlags
-*/
-uint32 ads_uf2atype(uint32 uf)
-{
-       uint32 atype = 0x00000000;
-
-       if (uf & UF_NORMAL_ACCOUNT)                     atype = ATYPE_NORMAL_ACCOUNT;
-       else if (uf & UF_TEMP_DUPLICATE_ACCOUNT)        atype = ATYPE_NORMAL_ACCOUNT;
-       else if (uf & UF_SERVER_TRUST_ACCOUNT)          atype = ATYPE_WORKSTATION_TRUST;
-       else if (uf & UF_WORKSTATION_TRUST_ACCOUNT)     atype = ATYPE_WORKSTATION_TRUST;
-       else if (uf & UF_INTERDOMAIN_TRUST_ACCOUNT)     atype = ATYPE_INTERDOMAIN_TRUST;
-
-       return atype;
-}
-
-/*
-get the accountType from the groupType
-*/
-uint32 ads_gtype2atype(uint32 gtype)
-{
-       uint32 atype = 0x00000000;
-
-       switch(gtype) {
-               case GTYPE_SECURITY_BUILTIN_LOCAL_GROUP:
-                       atype = ATYPE_SECURITY_LOCAL_GROUP;
-                       break;
-               case GTYPE_SECURITY_DOMAIN_LOCAL_GROUP:
-                       atype = ATYPE_SECURITY_LOCAL_GROUP;
-                       break;
-               case GTYPE_SECURITY_GLOBAL_GROUP:
-                       atype = ATYPE_SECURITY_GLOBAL_GROUP;
-                       break;
-
-               case GTYPE_DISTRIBUTION_GLOBAL_GROUP:
-                       atype = ATYPE_DISTRIBUTION_GLOBAL_GROUP;
-                       break;
-               case GTYPE_DISTRIBUTION_DOMAIN_LOCAL_GROUP:
-                       atype = ATYPE_DISTRIBUTION_UNIVERSAL_GROUP;
-                       break;
-               case GTYPE_DISTRIBUTION_UNIVERSAL_GROUP:
-                       atype = ATYPE_DISTRIBUTION_LOCAL_GROUP;
-                       break;
-       }
-
-       return atype;
-}
-
-/* turn a sAMAccountType into a SID_NAME_USE */
-enum lsa_SidType ads_atype_map(uint32 atype)
-{
-       switch (atype & 0xF0000000) {
-       case ATYPE_GLOBAL_GROUP:
-               return SID_NAME_DOM_GRP;
-       case ATYPE_SECURITY_LOCAL_GROUP:
-               return SID_NAME_ALIAS;
-       case ATYPE_ACCOUNT:
-               return SID_NAME_USER;
-       default:
-               DEBUG(1,("hmm, need to map account type 0x%x\n", atype));
-       }
-       return SID_NAME_UNKNOWN;
-}
index 39472b2..9fa3ddd 100644 (file)
@@ -770,7 +770,7 @@ static uint32_t samr_acb_flags_to_netapi_flags(uint32_t acb)
 {
        uint32_t fl = UF_SCRIPT; /* god knows why */
 
-       fl |= ads_acb2uf(acb);
+       fl |= ds_acb2uf(acb);
 
        return fl;
 }
index ddfeb8e..4f7c210 100644 (file)
@@ -250,7 +250,7 @@ static NTSTATUS pdb_ads_init_sam_from_priv(struct pdb_methods *m,
                DEBUG(10, ("Could not pull userAccountControl\n"));
                goto fail;
        }
-       pdb_set_acct_ctrl(sam, ads_uf2acb(n), PDB_SET);
+       pdb_set_acct_ctrl(sam, ds_uf2acb(n), PDB_SET);
 
        if (tldap_get_single_valueblob(entry, "unicodePwd", &blob)) {
                if (blob.length != NT_HASH_LEN) {
@@ -310,7 +310,7 @@ static bool pdb_ads_init_ads_from_sam(struct pdb_ads_state *state,
 
        ret &= tldap_make_mod_fmt(
                existing, mem_ctx, pnum_mods, pmods, "userAccountControl",
-               "%d", ads_acb2uf(pdb_get_acct_ctrl(sam)));
+               "%d", ds_acb2uf(pdb_get_acct_ctrl(sam)));
 
        ret &= tldap_make_mod_fmt(
                existing, mem_ctx, pnum_mods, pmods, "homeDirectory",
@@ -1682,7 +1682,7 @@ static NTSTATUS pdb_ads_lookup_rids(struct pdb_methods *m,
                        DEBUG(10, ("no samAccountType"));
                        continue;
                }
-               lsa_attrs[i] = ads_atype_map(attr);
+               lsa_attrs[i] = ds_atype_map(attr);
                num_mapped += 1;
        }
 
index edd7066..08afb46 100644 (file)
@@ -210,7 +210,7 @@ static NTSTATUS query_user_list(struct winbindd_domain *domain,
                gid_t primary_gid = (gid_t)-1;
 
                if (!ads_pull_uint32(ads, msg, "sAMAccountType", &atype) ||
-                   ads_atype_map(atype) != SID_NAME_USER) {
+                   ds_atype_map(atype) != SID_NAME_USER) {
                        DEBUG(1,("Not a user account? atype=0x%x\n", atype));
                        continue;
                }
index 8a21ea5..b1a46c3 100644 (file)
@@ -189,7 +189,7 @@ NTSTATUS fill_netlogon_samlogon_response(struct ldb_context *sam_ctx,
                                         "(!(userAccountControl:" LDB_OID_COMPARATOR_AND ":=%u))"
                                         "(userAccountControl:" LDB_OID_COMPARATOR_OR ":=%u))", 
                                         ldb_binary_encode_string(mem_ctx, user),
-                                        UF_ACCOUNTDISABLE, samdb_acb2uf(acct_control));
+                                        UF_ACCOUNTDISABLE, ds_acb2uf(acct_control));
                if (ret != LDB_SUCCESS) {
                        DEBUG(2,("Unable to find referece to user '%s' with ACB 0x%8x under %s: %s\n",
                                 user, acct_control, ldb_dn_get_linearized(dom_res->msgs[0]->dn),
index a2aa717..3111a78 100644 (file)
@@ -583,7 +583,7 @@ NTSTATUS sidmap_allocated_sid_lookup(struct sidmap_context *sidmap,
                struct passwd *pwd;
                uid_t uid = rid - SIDMAP_LOCAL_USER_BASE;
                atype = ATYPE_NORMAL_ACCOUNT;
-               *rtype = samdb_atype_map(atype);
+               *rtype = ds_atype_map(atype);
 
                pwd = getpwuid(uid);
                if (pwd == NULL) {
@@ -595,7 +595,7 @@ NTSTATUS sidmap_allocated_sid_lookup(struct sidmap_context *sidmap,
                struct group *grp;
                gid_t gid = rid - SIDMAP_LOCAL_GROUP_BASE;
                atype = ATYPE_LOCAL_GROUP;
-               *rtype = samdb_atype_map(atype);
+               *rtype = ds_atype_map(atype);
                grp = getgrgid(gid);
                if (grp == NULL) {
                        *name = talloc_asprintf(mem_ctx, "gid%u", gid);
index 30669eb..247aec7 100644 (file)
@@ -640,7 +640,7 @@ uint32_t samdb_result_acct_flags(struct ldb_context *sam_ctx, TALLOC_CTX *mem_ct
                                 struct ldb_message *msg, struct ldb_dn *domain_dn)
 {
        uint32_t userAccountControl = ldb_msg_find_attr_as_uint(msg, "userAccountControl", 0);
-       uint32_t acct_flags = samdb_uf2acb(userAccountControl); 
+       uint32_t acct_flags = ds_uf2acb(userAccountControl);
        NTTIME must_change_time;
        NTTIME now;
 
@@ -902,7 +902,7 @@ int samdb_msg_add_hashes(TALLOC_CTX *mem_ctx, struct ldb_message *msg,
 int samdb_msg_add_acct_flags(struct ldb_context *sam_ldb, TALLOC_CTX *mem_ctx, struct ldb_message *msg,
                             const char *attr_name, uint32_t v)
 {
-       return samdb_msg_add_uint(sam_ldb, mem_ctx, msg, attr_name, samdb_acb2uf(v));
+       return samdb_msg_add_uint(sam_ldb, mem_ctx, msg, attr_name, ds_acb2uf(v));
 }
 
 /*
index 0438647..2a9f70f 100644 (file)
@@ -26,8 +26,8 @@ PRIVATE_DEPENDENCIES = LIBLDB
 
 SAMDB_COMMON_OBJ_FILES = $(addprefix $(dsdbsrcdir)/common/, \
                sidmap.o \
-               flag_mapping.o \
-               util.o)
+               util.o) \
+               ../libds/common/flag_mapping.o
 $(eval $(call proto_header_template,$(dsdbsrcdir)/common/proto.h,$(SAMDB_COMMON_OBJ_FILES:.o=.c)))
 
 [SUBSYSTEM::SAMDB_SCHEMA]
index 8e21e38..544249c 100644 (file)
@@ -572,7 +572,7 @@ static int samldb_check_samAccountType(struct samldb_ctx *ac)
                                                "userAccountControl invalid");
                        return LDB_ERR_UNWILLING_TO_PERFORM;
                } else {
-                       account_type = samdb_uf2atype(uac);
+                       account_type = ds_uf2atype(uac);
                        ret = samdb_msg_add_uint(ldb,
                                                 ac->msg, ac->msg,
                                                 "sAMAccountType",
@@ -590,7 +590,7 @@ static int samldb_check_samAccountType(struct samldb_ctx *ac)
                                                "groupType invalid");
                        return LDB_ERR_UNWILLING_TO_PERFORM;
                } else {
-                       account_type = samdb_gtype2atype(group_type);
+                       account_type = ds_gtype2atype(group_type);
                        ret = samdb_msg_add_uint(ldb,
                                                 ac->msg, ac->msg,
                                                 "sAMAccountType",
@@ -1280,7 +1280,7 @@ static int samldb_modify(struct ldb_module *module, struct ldb_request *req)
                req->op.mod.message = msg = ldb_msg_copy_shallow(req, req->op.mod.message);
 
                group_type = strtoul((const char *)el->values[0].data, NULL, 0);
-               account_type =  samdb_gtype2atype(group_type);
+               account_type =  ds_gtype2atype(group_type);
                ret = samdb_msg_add_uint(ldb, msg, msg,
                                         "sAMAccountType",
                                         account_type);
@@ -1296,7 +1296,7 @@ static int samldb_modify(struct ldb_module *module, struct ldb_request *req)
                req->op.mod.message = msg = ldb_msg_copy_shallow(req, req->op.mod.message);
 
                user_account_control = strtoul((const char *)el->values[0].data, NULL, 0);
-               account_type = samdb_uf2atype(user_account_control);
+               account_type = ds_uf2atype(user_account_control);
                ret = samdb_msg_add_uint(ldb, msg, msg,
                                         "sAMAccountType",
                                         account_type);
index dc47d37..005c7d4 100644 (file)
@@ -394,7 +394,7 @@ static NTSTATUS dcesrv_lsa_lookup_name(struct tevent_context *ev_ctx,
 
                atype = samdb_result_uint(res[i], "sAMAccountType", 0);
                        
-               *rtype = samdb_atype_map(atype);
+               *rtype = ds_atype_map(atype);
                if (*rtype == SID_NAME_UNKNOWN) {
                        return STATUS_SOME_UNMAPPED;
                }
@@ -503,7 +503,7 @@ static NTSTATUS dcesrv_lsa_lookup_sid(struct lsa_policy_state *state, TALLOC_CTX
 
                atype = samdb_result_uint(res[0], "sAMAccountType", 0);
 
-               *rtype = samdb_atype_map(atype);
+               *rtype = ds_atype_map(atype);
 
                return NT_STATUS_OK;
        }
index 489247c..c755601 100644 (file)
@@ -1360,7 +1360,7 @@ static NTSTATUS dcesrv_samr_CreateUser2(struct dcesrv_call_state *dce_call, TALL
                                  UF_INTERDOMAIN_TRUST_ACCOUNT | 
                                  UF_WORKSTATION_TRUST_ACCOUNT | 
                                  UF_SERVER_TRUST_ACCOUNT));
-       user_account_control |= samdb_acb2uf(r->in.acct_flags);
+       user_account_control |= ds_acb2uf(r->in.acct_flags);
 
        talloc_free(msg);
        msg = ldb_msg_new(mem_ctx);
@@ -1876,7 +1876,7 @@ static NTSTATUS dcesrv_samr_LookupNames(struct dcesrv_call_state *dce_call, TALL
                        continue;
                }
 
-               rtype = samdb_atype_map(atype);
+               rtype = ds_atype_map(atype);
                
                if (rtype == SID_NAME_UNKNOWN) {
                        status = STATUS_SOME_UNMAPPED;
@@ -1962,7 +1962,7 @@ static NTSTATUS dcesrv_samr_LookupRids(struct dcesrv_call_state *dce_call, TALLO
                        continue;
                }
 
-               ids[i] = samdb_atype_map(atype);
+               ids[i] = ds_atype_map(atype);
                
                if (ids[i] == SID_NAME_UNKNOWN) {
                        status = STATUS_SOME_UNMAPPED;