summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2010-09-04 14:04:55 +1000
committerJeremy Allison <jra@samba.org>2010-09-14 14:48:48 -0700
commitce1e273a47105fcef71d054c0192b7985fd5b4f2 (patch)
tree642c0c653bc85bfd4e2f53ce32724bb23c586d94 /source3
parent4e8d6a779c9aa9b9418b4f835d831ad4492c3f6c (diff)
downloadsamba-ce1e273a47105fcef71d054c0192b7985fd5b4f2.tar.gz
samba-ce1e273a47105fcef71d054c0192b7985fd5b4f2.tar.bz2
samba-ce1e273a47105fcef71d054c0192b7985fd5b4f2.zip
s3-dom_sid Use C99 types in dom_sid handling
Andrew Bartlett
Diffstat (limited to 'source3')
-rw-r--r--source3/lib/util_sid.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/source3/lib/util_sid.c b/source3/lib/util_sid.c
index 4e0ddd2e49..58df0f2a48 100644
--- a/source3/lib/util_sid.c
+++ b/source3/lib/util_sid.c
@@ -203,7 +203,7 @@ bool string_to_sid(struct dom_sid *sidout, const char *sidstr)
const char *p;
char *q;
/* BIG NOTE: this function only does SIDS where the identauth is not >= 2^32 */
- uint32 conv;
+ uint32_t conv;
if ((sidstr[0] != 'S' && sidstr[0] != 's') || sidstr[1] != '-') {
goto format_error;
@@ -218,11 +218,11 @@ bool string_to_sid(struct dom_sid *sidout, const char *sidstr)
goto format_error;
}
- conv = (uint32) strtoul(p, &q, 10);
+ conv = (uint32_t) strtoul(p, &q, 10);
if (!q || (*q != '-')) {
goto format_error;
}
- sidout->sid_rev_num = (uint8) conv;
+ sidout->sid_rev_num = (uint8_t) conv;
q++;
if (!isdigit(*q)) {
@@ -230,8 +230,8 @@ bool string_to_sid(struct dom_sid *sidout, const char *sidstr)
}
/* get identauth */
- conv = (uint32) strtoul(q, &q, 10);
if (!q || (*q != '-')) {
+ conv = (uint32_t) strtoul(q, &q, 10);
goto format_error;
}
/* identauth in decimal should be < 2^32 */
@@ -283,13 +283,13 @@ format_error:
Add a rid to the end of a sid
*****************************************************************/
-bool sid_append_rid(struct dom_sid *sid, uint32 rid)
+bool sid_append_rid(struct dom_sid *sid, uint32_t rid)
{
if (sid->num_auths < MAXSUBAUTHS) {
sid->sub_auths[sid->num_auths++] = rid;
- return True;
+ return true;
}
- return False;
+ return false;
}
bool sid_compose(struct dom_sid *dst, const struct dom_sid *domain_sid, uint32 rid)