summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2006-03-15 11:56:58 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:57:25 -0500
commit475bbbfa842d96b65de07eb1d5bd6982bfc41b4e (patch)
treed78040280607d7023c6c12b0f366f9d34918ba45 /source4
parent22244f0e9bcbdc52a0410861adb822197a583257 (diff)
downloadsamba-475bbbfa842d96b65de07eb1d5bd6982bfc41b4e.tar.gz
samba-475bbbfa842d96b65de07eb1d5bd6982bfc41b4e.tar.bz2
samba-475bbbfa842d96b65de07eb1d5bd6982bfc41b4e.zip
r14442: the ACB_ flags are 32 bit...
metze (This used to be commit a653ebd15da09a7e085338400925a6bbeb3cb316)
Diffstat (limited to 'source4')
-rw-r--r--source4/dsdb/common/flag_mapping.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/source4/dsdb/common/flag_mapping.c b/source4/dsdb/common/flag_mapping.c
index eab0d67825..150179b841 100644
--- a/source4/dsdb/common/flag_mapping.c
+++ b/source4/dsdb/common/flag_mapping.c
@@ -30,7 +30,7 @@ translated the ACB_CTRL Flags to UserFlags (userAccountControl)
/* mapping between ADS userAccountControl and SAMR acct_flags */
static const struct {
uint32_t uf;
- uint16_t acb;
+ uint32_t acb;
} acct_flags_map[] = {
{ UF_ACCOUNTDISABLE, ACB_DISABLED },
{ UF_HOMEDIR_REQUIRED, ACB_HOMDIRREQ },
@@ -45,7 +45,7 @@ static const struct {
{ UF_LOCKOUT, ACB_AUTOLOCK }
};
-uint32_t samdb_acb2uf(uint16_t acb)
+uint32_t samdb_acb2uf(uint32_t acb)
{
uint32_t i, ret = 0;
for (i=0;i<ARRAY_SIZE(acct_flags_map);i++) {
@@ -59,10 +59,10 @@ uint32_t samdb_acb2uf(uint16_t acb)
/*
translated the UserFlags (userAccountControl) to ACB_CTRL Flags
*/
-uint16_t samdb_uf2acb(uint32_t uf)
+uint32_t samdb_uf2acb(uint32_t uf)
{
uint32_t i;
- uint16_t ret = 0;
+ uint32_t ret = 0;
for (i=0;i<ARRAY_SIZE(acct_flags_map);i++) {
if (acct_flags_map[i].uf & uf) {
ret |= acct_flags_map[i].acb;