diff options
| author | Stefan Metzmacher <metze@samba.org> | 2004-05-25 17:24:24 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 12:56:16 -0500 |
| commit | f88bf54c7f6d1c2ef833047eb8327953c304b5ff (patch) | |
| tree | 07da4ab8641b2200eaca5b5ea9adba26b0712277 /source4/rpc_server/samr | |
| parent | f2ad98a165cdec6d344a96aeb21a38518a10720a (diff) | |
| download | samba-f88bf54c7f6d1c2ef833047eb8327953c304b5ff.tar.gz samba-f88bf54c7f6d1c2ef833047eb8327953c304b5ff.tar.bz2 samba-f88bf54c7f6d1c2ef833047eb8327953c304b5ff.zip | |
r889: convert samba4 to use [u]int16_t instead of [u]int16
metze
(This used to be commit af6f1f8a01bebbecd99bc8c066519e89966e65e3)
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; |