From d8071e7ed7c57e8b0f2d80420e27f9ea7ab63022 Mon Sep 17 00:00:00 2001 From: Matt Kraai Date: Tue, 5 Jan 2010 09:42:54 -0800 Subject: Change uint_t to unsigned int in source4 Signed-off-by: Stefan Metzmacher --- source4/dsdb/common/util.c | 16 ++++++++-------- source4/dsdb/samdb/ldb_modules/password_hash.c | 4 ++-- 2 files changed, 10 insertions(+), 10 deletions(-) (limited to 'source4/dsdb') diff --git a/source4/dsdb/common/util.c b/source4/dsdb/common/util.c index b57d383b2b..8de44726fa 100644 --- a/source4/dsdb/common/util.c +++ b/source4/dsdb/common/util.c @@ -208,9 +208,9 @@ int samdb_search_count(struct ldb_context *sam_ldb, /* search the sam for a single integer attribute in exactly 1 record */ -uint_t samdb_search_uint(struct ldb_context *sam_ldb, +unsigned int samdb_search_uint(struct ldb_context *sam_ldb, TALLOC_CTX *mem_ctx, - uint_t default_value, + unsigned int default_value, struct ldb_dn *basedn, const char *attr_name, const char *format, ...) _PRINTF_ATTRIBUTE(6,7) @@ -314,7 +314,7 @@ int samdb_search_string_multiple(struct ldb_context *sam_ldb, /* pull a uint from a result set. */ -uint_t samdb_result_uint(const struct ldb_message *msg, const char *attr, uint_t default_value) +unsigned int samdb_result_uint(const struct ldb_message *msg, const char *attr, unsigned int default_value) { return ldb_msg_find_attr_as_uint(msg, attr, default_value); } @@ -557,10 +557,10 @@ struct samr_Password *samdb_result_hash(TALLOC_CTX *mem_ctx, const struct ldb_me /* pull an array of samr_Password structutres from a result set. */ -uint_t samdb_result_hashes(TALLOC_CTX *mem_ctx, const struct ldb_message *msg, +unsigned int samdb_result_hashes(TALLOC_CTX *mem_ctx, const struct ldb_message *msg, const char *attr, struct samr_Password **hashes) { - uint_t count, i; + unsigned int count, i; const struct ldb_val *val = ldb_msg_find_ldb_val(msg, attr); *hashes = NULL; @@ -846,10 +846,10 @@ int samdb_msg_add_int(struct ldb_context *sam_ldb, TALLOC_CTX *mem_ctx, struct l } /* - add a uint_t element to a message + add a unsigned int element to a message */ int samdb_msg_add_uint(struct ldb_context *sam_ldb, TALLOC_CTX *mem_ctx, struct ldb_message *msg, - const char *attr_name, uint_t v) + const char *attr_name, unsigned int v) { return samdb_msg_add_int(sam_ldb, mem_ctx, msg, attr_name, (int)v); } @@ -892,7 +892,7 @@ int samdb_msg_add_hash(struct ldb_context *sam_ldb, TALLOC_CTX *mem_ctx, struct add a samr_Password array to a message */ int samdb_msg_add_hashes(TALLOC_CTX *mem_ctx, struct ldb_message *msg, - const char *attr_name, struct samr_Password *hashes, uint_t count) + const char *attr_name, struct samr_Password *hashes, unsigned int count) { struct ldb_val val; int i; diff --git a/source4/dsdb/samdb/ldb_modules/password_hash.c b/source4/dsdb/samdb/ldb_modules/password_hash.c index df4a344298..cd588211da 100644 --- a/source4/dsdb/samdb/ldb_modules/password_hash.c +++ b/source4/dsdb/samdb/ldb_modules/password_hash.c @@ -84,8 +84,8 @@ struct ph_context { struct domain_data { bool store_cleartext; - uint_t pwdProperties; - uint_t pwdHistoryLength; + unsigned int pwdProperties; + unsigned int pwdHistoryLength; const char *netbios_domain; const char *dns_domain; const char *realm; -- cgit