diff options
Diffstat (limited to 'source4/rpc_server/samr')
| -rw-r--r-- | source4/rpc_server/samr/samdb.c | 2 | ||||
| -rw-r--r-- | source4/rpc_server/samr/samr_utils.c | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/source4/rpc_server/samr/samdb.c b/source4/rpc_server/samr/samdb.c index 98374c6c86..76de3e3c30 100644 --- a/source4/rpc_server/samr/samdb.c +++ b/source4/rpc_server/samr/samdb.c @@ -571,7 +571,7 @@ struct samr_LogonHours samdb_result_logon_hours(TALLOC_CTX *mem_ctx, struct ldb_ /* pull a set of account_flags from a result set. */ -uint16 samdb_result_acct_flags(struct ldb_message *msg, const char *attr) +uint16_t samdb_result_acct_flags(struct ldb_message *msg, const char *attr) { uint_t userAccountControl = ldb_msg_find_uint(msg, attr, 0); return samdb_uf2acb(userAccountControl); diff --git a/source4/rpc_server/samr/samr_utils.c b/source4/rpc_server/samr/samr_utils.c index 6b8a2ff19a..8297792cc2 100644 --- a/source4/rpc_server/samr/samr_utils.c +++ b/source4/rpc_server/samr/samr_utils.c @@ -28,7 +28,7 @@ translated the ACB_CTRL Flags to UserFlags (userAccountControl) /* mapping between ADS userAccountControl and SAMR acct_flags */ static const struct { uint32_t uf; - uint16 acb; + uint16_t acb; } acct_flags_map[] = { { UF_ACCOUNTDISABLE, ACB_DISABLED }, { UF_HOMEDIR_REQUIRED, ACB_HOMDIRREQ }, @@ -43,7 +43,7 @@ static const struct { { UF_LOCKOUT, ACB_AUTOLOCK } }; -uint32_t samdb_acb2uf(uint16 acb) +uint32_t samdb_acb2uf(uint16_t acb) { uint32_t i, ret = 0; for (i=0;i<ARRAY_SIZE(acct_flags_map);i++) { @@ -57,10 +57,10 @@ uint32_t samdb_acb2uf(uint16 acb) /* translated the UserFlags (userAccountControl) to ACB_CTRL Flags */ -uint16 samdb_uf2acb(uint32_t uf) +uint16_t samdb_uf2acb(uint32_t uf) { uint32_t i; - uint16 ret = 0; + uint16_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; |