13 files changed, 65 insertions, 65 deletions

diff --git a/source4/rpc_server/common/server_info.c b/source4/rpc_server/common/server_info.c
index fc86e0f8c1..1d16b8fe61 100644
--- a/source4/rpc_server/common/server_info.c
+++ b/source4/rpc_server/common/server_info.c
@@ -27,7 +27,7 @@
 */
 
 /* This hardcoded value should go into a ldb database! */
-uint32 dcesrv_common_get_platform_id(TALLOC_CTX *mem_ctx, struct dcesrv_context *dce_ctx)
+uint32_t dcesrv_common_get_platform_id(TALLOC_CTX *mem_ctx, struct dcesrv_context *dce_ctx)
 {
 	return 500;
 }
@@ -43,13 +43,13 @@ const char *dcesrv_common_get_domain_name(TALLOC_CTX *mem_ctx, struct dcesrv_con
 }
 
 /* This hardcoded value should go into a ldb database! */
-uint32 dcesrv_common_get_version_major(TALLOC_CTX *mem_ctx, struct dcesrv_context *dce_ctx)
+uint32_t dcesrv_common_get_version_major(TALLOC_CTX *mem_ctx, struct dcesrv_context *dce_ctx)
 {
 	return 5;
 }
 
 /* This hardcoded value should go into a ldb database! */
-uint32 dcesrv_common_get_version_minor(TALLOC_CTX *mem_ctx, struct dcesrv_context *dce_ctx)
+uint32_t dcesrv_common_get_version_minor(TALLOC_CTX *mem_ctx, struct dcesrv_context *dce_ctx)
 {
 	return 2;
 }
diff --git a/source4/rpc_server/common/share_info.c b/source4/rpc_server/common/share_info.c
index b544353304..eae11b0f40 100644
--- a/source4/rpc_server/common/share_info.c
+++ b/source4/rpc_server/common/share_info.c
@@ -27,9 +27,9 @@
 */
 
 /* This hardcoded value should go into a ldb database! */
-uint32 dcesrv_common_get_count_of_shares(TALLOC_CTX *mem_ctx, struct dcesrv_context *dce_ctx)
+uint32_t dcesrv_common_get_count_of_shares(TALLOC_CTX *mem_ctx, struct dcesrv_context *dce_ctx)
 {
-	/* what's about int -> uint32 overflow */
+	/* what's about int -> uint32_t overflow */
 	return lp_numservices();
 }
 
@@ -44,25 +44,25 @@ const char *dcesrv_common_get_share_comment(TALLOC_CTX *mem_ctx, struct dcesrv_c
 }
 
 /* This hardcoded value should go into a ldb database! */
-uint32 dcesrv_common_get_share_permissions(TALLOC_CTX *mem_ctx, struct dcesrv_context *dce_ctx, int snum)
+uint32_t dcesrv_common_get_share_permissions(TALLOC_CTX *mem_ctx, struct dcesrv_context *dce_ctx, int snum)
 {
 	return 0;
 }
 
 /* This hardcoded value should go into a ldb database! */
-uint32 dcesrv_common_get_share_max_users(TALLOC_CTX *mem_ctx, struct dcesrv_context *dce_ctx, int snum)
+uint32_t dcesrv_common_get_share_max_users(TALLOC_CTX *mem_ctx, struct dcesrv_context *dce_ctx, int snum)
 {
 	return 10;
 }
 
 /* This hardcoded value should go into a ldb database! */
-uint32 dcesrv_common_get_share_current_users(TALLOC_CTX *mem_ctx, struct dcesrv_context *dce_ctx, int snum)
+uint32_t dcesrv_common_get_share_current_users(TALLOC_CTX *mem_ctx, struct dcesrv_context *dce_ctx, int snum)
 {
 	return 1;
 }
 
 /* This hardcoded value should go into a ldb database! */
-uint32 dcesrv_common_get_share_type(TALLOC_CTX *mem_ctx, struct dcesrv_context *dce_ctx, int snum)
+uint32_t dcesrv_common_get_share_type(TALLOC_CTX *mem_ctx, struct dcesrv_context *dce_ctx, int snum)
 {
 	/* for disk share	0x00000000
 	 * for print share	0x00000001
@@ -88,13 +88,13 @@ const char *dcesrv_common_get_share_password(TALLOC_CTX *mem_ctx, struct dcesrv_
 }
 
 /* This hardcoded value should go into a ldb database! */
-uint32 dcesrv_common_get_share_csc_policy(TALLOC_CTX *mem_ctx, struct dcesrv_context *dce_ctx, int snum)
+uint32_t dcesrv_common_get_share_csc_policy(TALLOC_CTX *mem_ctx, struct dcesrv_context *dce_ctx, int snum)
 {
 	return 0;
 }
 
 /* This hardcoded value should go into a ldb database! */
-uint32 dcesrv_common_get_share_unknown(TALLOC_CTX *mem_ctx, struct dcesrv_context *dce_ctx, int snum)
+uint32_t dcesrv_common_get_share_unknown(TALLOC_CTX *mem_ctx, struct dcesrv_context *dce_ctx, int snum)
 {
 	return 0;
 }
diff --git a/source4/rpc_server/dcerpc_server.c b/source4/rpc_server/dcerpc_server.c
index b89bec40bb..350621aa6b 100644
--- a/source4/rpc_server/dcerpc_server.c
+++ b/source4/rpc_server/dcerpc_server.c
@@ -100,7 +100,7 @@ static const struct dcesrv_interface *find_interface(const struct dcesrv_endpoin
   see if a uuid and if_version match to an interface
 */
 static BOOL interface_match_by_uuid(const struct dcesrv_interface *iface,
-							const char *uuid, uint32 if_version)
+							const char *uuid, uint32_t if_version)
 {
 	if (iface->ndr->if_version != if_version) {
 		return False;
@@ -117,7 +117,7 @@ static BOOL interface_match_by_uuid(const struct dcesrv_interface *iface,
   find the interface operations on an endpoint by uuid
 */
 static const struct dcesrv_interface *find_interface_by_uuid(const struct dcesrv_endpoint *endpoint,
-						       const char *uuid, uint32 if_version)
+						       const char *uuid, uint32_t if_version)
 {
 	struct dcesrv_if_list *ifl;
 	for (ifl=endpoint->interface_list; ifl; ifl=ifl->next) {
@@ -347,7 +347,7 @@ static void dcesrv_init_hdr(struct dcerpc_packet *pkt)
 /*
   return a dcerpc fault
 */
-static NTSTATUS dcesrv_fault(struct dcesrv_call_state *call, uint32 fault_code)
+static NTSTATUS dcesrv_fault(struct dcesrv_call_state *call, uint32_t fault_code)
 {
 	struct dcerpc_packet pkt;
 	struct dcesrv_call_reply *rep;
@@ -386,7 +386,7 @@ static NTSTATUS dcesrv_fault(struct dcesrv_call_state *call, uint32 fault_code)
 /*
   return a dcerpc bind_nak
 */
-static NTSTATUS dcesrv_bind_nak(struct dcesrv_call_state *call, uint32 reason)
+static NTSTATUS dcesrv_bind_nak(struct dcesrv_call_state *call, uint32_t reason)
 {
 	struct dcerpc_packet pkt;
 	struct dcesrv_call_reply *rep;
@@ -426,11 +426,11 @@ static NTSTATUS dcesrv_bind_nak(struct dcesrv_call_state *call, uint32 reason)
 static NTSTATUS dcesrv_bind(struct dcesrv_call_state *call)
 {
 	const char *uuid, *transfer_syntax;
-	uint32 if_version, transfer_syntax_version;
+	uint32_t if_version, transfer_syntax_version;
 	struct dcerpc_packet pkt;
 	struct dcesrv_call_reply *rep;
 	NTSTATUS status;
-	uint32 result=0, reason=0;
+	uint32_t result=0, reason=0;
 
 	if (call->pkt.u.bind.num_contexts != 1 ||
 	    call->pkt.u.bind.ctx_list[0].num_transfer_syntaxes < 1) {
@@ -558,7 +558,7 @@ static NTSTATUS dcesrv_request(struct dcesrv_call_state *call)
 	void *r;
 	NTSTATUS status;
 	DATA_BLOB stub;
-	uint32 total_length;
+	uint32_t total_length;
 
 
 	if (!call->conn->iface) {
@@ -619,7 +619,7 @@ static NTSTATUS dcesrv_request(struct dcesrv_call_state *call)
 	total_length = stub.length;
 
 	do {
-		uint32 length;
+		uint32_t length;
 		struct dcesrv_call_reply *rep;
 		struct dcerpc_packet pkt;
 
@@ -688,7 +688,7 @@ static BOOL dce_full_packet(const DATA_BLOB *data)
 /*
   we might have consumed only part of our input - advance past that part
 */
-static void dce_partial_advance(struct dcesrv_connection *dce_conn, uint32 offset)
+static void dce_partial_advance(struct dcesrv_connection *dce_conn, uint32_t offset)
 {
 	DATA_BLOB blob;
 
@@ -761,7 +761,7 @@ NTSTATUS dcesrv_input_process(struct dcesrv_connection *dce_conn)
 	/* see if this is a continued packet */
 	if (!(call->pkt.pfc_flags & DCERPC_PFC_FLAG_FIRST)) {
 		struct dcesrv_call_state *call2 = call;
-		uint32 alloc_size;
+		uint32_t alloc_size;
 
 		/* we only allow fragmented requests, no other packet types */
 		if (call->pkt.ptype != DCERPC_PKT_REQUEST) {
diff --git a/source4/rpc_server/dcerpc_server.h b/source4/rpc_server/dcerpc_server.h
index 5f61167906..2d833ebd58 100644
--- a/source4/rpc_server/dcerpc_server.h
+++ b/source4/rpc_server/dcerpc_server.h
@@ -39,7 +39,7 @@ struct dcesrv_ep_description {
 	enum endpoint_type type;
 	union {
 		const char *smb_pipe;
-		uint32 tcp_port;
+		uint32_t tcp_port;
 	} info;
 };
 
@@ -79,7 +79,7 @@ struct dcesrv_call_state {
 	} *replies;
 
 	/* this is used by the boilerplate code to generate DCERPC faults */
-	uint32 fault_code;
+	uint32_t fault_code;
 };
 
 #define DCESRV_HANDLE_ANY 255
@@ -117,7 +117,7 @@ struct dcesrv_connection {
 	struct dcesrv_call_state *call_list;
 
 	/* the maximum size the client wants to receive */
-	uint32 cli_max_recv_frag;
+	uint32_t cli_max_recv_frag;
 
 	/* private data for the interface implementation */
 	void *private;
@@ -149,7 +149,7 @@ struct dcesrv_endpoint_server {
 	 * ask for a dcesrv_interface implementation
 	 * - iface must be referenz to an allready existent struct !
 	 */
-	BOOL (*interface_by_uuid)(struct dcesrv_interface *iface, const char *, uint32);
+	BOOL (*interface_by_uuid)(struct dcesrv_interface *iface, const char *, uint32_t);
 
 	/* this function can be used by other endpoint servers to
 	 * ask for a dcesrv_interface implementation
diff --git a/source4/rpc_server/dcerpc_tcp.c b/source4/rpc_server/dcerpc_tcp.c
index 869ee1cb64..e349de6194 100644
--- a/source4/rpc_server/dcerpc_tcp.c
+++ b/source4/rpc_server/dcerpc_tcp.c
@@ -191,7 +191,7 @@ void init_rpc_session(struct event_context *ev, void *private, int fd)
  */
 static void setup_listen_rpc(struct event_context *events,
 			     const struct model_ops *model_ops, 
-			     struct in_addr *ifip, uint32 *port,
+			     struct in_addr *ifip, uint32_t *port,
 			     struct rpc_server_context *r,
 			     const struct dcesrv_endpoint *endpoint)
 {
diff --git a/source4/rpc_server/epmapper/rpc_epmapper.c b/source4/rpc_server/epmapper/rpc_epmapper.c
index 7bfeaf2fee..b5113a881b 100644
--- a/source4/rpc_server/epmapper/rpc_epmapper.c
+++ b/source4/rpc_server/epmapper/rpc_epmapper.c
@@ -31,7 +31,7 @@ struct dcesrv_ep_iface {
 	const char *name;
 	struct dcesrv_ep_description ep_description;
 	const char *uuid;
-	uint32 if_version;
+	uint32_t if_version;
 };
 
 /*
@@ -112,12 +112,12 @@ static BOOL fill_protocol_tower(TALLOC_CTX *mem_ctx, struct epm_towers *twr,
 /*
   build a list of all interfaces handled by all endpoint servers
 */
-static uint32 build_ep_list(TALLOC_CTX *mem_ctx,
+static uint32_t build_ep_list(TALLOC_CTX *mem_ctx,
 			    struct dcesrv_endpoint *endpoint_list,
 			    struct dcesrv_ep_iface **eps)
 {
 	struct dcesrv_endpoint *d;
-	uint32 total = 0;
+	uint32_t total = 0;
 
 	(*eps) = NULL;
 	
@@ -165,10 +165,10 @@ static NTSTATUS epm_Lookup(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_c
 {
 	struct dcesrv_handle *h;
 	struct rpc_eps {
-		uint32 count;
+		uint32_t count;
 		struct dcesrv_ep_iface *e;
 	} *eps;
-	uint32 num_ents;
+	uint32_t num_ents;
 	int i;
 
 	h = dcesrv_handle_fetch(dce_call->conn, r->in.entry_handle, HTYPE_LOOKUP);
@@ -240,7 +240,7 @@ static NTSTATUS epm_Lookup(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_c
 static NTSTATUS epm_Map(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx, 
 			struct epm_Map *r)
 {
-	uint32 count;
+	uint32_t count;
 	int i;
 	struct dcesrv_ep_iface *eps;
 	struct epm_floor *floors;
diff --git a/source4/rpc_server/netlogon/dcerpc_netlogon.c b/source4/rpc_server/netlogon/dcerpc_netlogon.c
index d4e60771ba..f6b758ad98 100644
--- a/source4/rpc_server/netlogon/dcerpc_netlogon.c
+++ b/source4/rpc_server/netlogon/dcerpc_netlogon.c
@@ -30,7 +30,7 @@ struct server_pipe_state {
 	BOOL authenticated;
 	char *account_name;
 	char *computer_name;  /* for logging only */
-	uint32 acct_flags;
+	uint32_t acct_flags;
 	uint16 sec_chan_type;
 	struct creds_CredentialState *creds;
 };
@@ -139,10 +139,10 @@ static NTSTATUS netr_ServerAuthenticateInternals(struct server_pipe_state *pipe_
 						 const char *account_name, 
 						 const char *computer_name, 
 						 uint16 secure_channel_type,
-						 uint32 in_flags,
+						 uint32_t in_flags,
 						 const struct netr_Credential *client_credentials,
 						 struct netr_Credential *server_credentials,
-						 uint32 *out_flags) 
+						 uint32_t *out_flags) 
 {
 	void *sam_ctx;
 	uint8 *mach_pwd;
diff --git a/source4/rpc_server/remote/dcesrv_remote.c b/source4/rpc_server/remote/dcesrv_remote.c
index 710c2f514a..7856908236 100644
--- a/source4/rpc_server/remote/dcesrv_remote.c
+++ b/source4/rpc_server/remote/dcesrv_remote.c
@@ -154,7 +154,7 @@ static BOOL remote_fill_interface(struct dcesrv_interface *iface, const struct d
 	return True;
 }
 
-static BOOL remote_op_interface_by_uuid(struct dcesrv_interface *iface, const char *uuid, uint32 if_version)
+static BOOL remote_op_interface_by_uuid(struct dcesrv_interface *iface, const char *uuid, uint32_t if_version)
 {
 	int i;
 
diff --git a/source4/rpc_server/samr/dcesrv_samr.c b/source4/rpc_server/samr/dcesrv_samr.c
index 7592c479fa..1ffda9795b 100644
--- a/source4/rpc_server/samr/dcesrv_samr.c
+++ b/source4/rpc_server/samr/dcesrv_samr.c
@@ -405,7 +405,7 @@ static NTSTATUS samr_CreateDomainGroup(struct dcesrv_call_state *dce_call, TALLO
 	struct dcesrv_handle *h;
 	const char *name;
 	struct ldb_message msg;
-	uint32 rid;
+	uint32_t rid;
 	const char *groupname, *sidstr;
 	time_t now = time(NULL);
 	TALLOC_CTX *mem_ctx2;
@@ -549,7 +549,7 @@ static NTSTATUS samr_CreateUser2(struct dcesrv_call_state *dce_call, TALLOC_CTX
 	struct dcesrv_handle *h;
 	const char *name;
 	struct ldb_message msg;
-	uint32 rid;
+	uint32_t rid;
 	const char *username, *sidstr;
 	time_t now = time(NULL);
 	TALLOC_CTX *mem_ctx2;
@@ -718,7 +718,7 @@ static NTSTATUS samr_CreateUser(struct dcesrv_call_state *dce_call, TALLOC_CTX *
 				struct samr_CreateUser *r)
 {
 	struct samr_CreateUser2 r2;
-	uint32 access_granted;
+	uint32_t access_granted;
 
 
 	/* a simple wrapper around samr_CreateUser2 works nicely */
@@ -873,8 +873,8 @@ static NTSTATUS samr_LookupNames(struct dcesrv_call_state *dce_call, TALLOC_CTX
 		return NT_STATUS_OK;
 	}
 
-	r->out.rids.ids = talloc_array_p(mem_ctx, uint32, r->in.num_names);
-	r->out.types.ids = talloc_array_p(mem_ctx, uint32, r->in.num_names);
+	r->out.rids.ids = talloc_array_p(mem_ctx, uint32_t, r->in.num_names);
+	r->out.types.ids = talloc_array_p(mem_ctx, uint32_t, r->in.num_names);
 	if (!r->out.rids.ids || !r->out.types.ids) {
 		return NT_STATUS_NO_MEMORY;
 	}
@@ -885,7 +885,7 @@ static NTSTATUS samr_LookupNames(struct dcesrv_call_state *dce_call, TALLOC_CTX
 		struct ldb_message **res;
 		struct dom_sid2 *sid;
 		const char *sidstr;
-		uint32 atype, rtype;
+		uint32_t atype, rtype;
 
 		r->out.rids.ids[i] = 0;
 		r->out.types.ids[i] = SID_NAME_UNKNOWN;
diff --git a/source4/rpc_server/samr/dcesrv_samr.h b/source4/rpc_server/samr/dcesrv_samr.h
index 980bb5e9cd..205e107207 100644
--- a/source4/rpc_server/samr/dcesrv_samr.h
+++ b/source4/rpc_server/samr/dcesrv_samr.h
@@ -39,7 +39,7 @@ struct samr_connect_state {
 	int reference_count;
 	void *sam_ctx;
 	TALLOC_CTX *mem_ctx;
-	uint32 access_mask;
+	uint32_t access_mask;
 };
 
 /*
@@ -50,7 +50,7 @@ struct samr_domain_state {
 	int reference_count;
 	void *sam_ctx;
 	TALLOC_CTX *mem_ctx;
-	uint32 access_mask;
+	uint32_t access_mask;
 	const char *domain_sid;
 	const char *domain_name;
 	const char *domain_dn;
@@ -63,7 +63,7 @@ struct samr_account_state {
 	struct samr_domain_state *domain_state;
 	void *sam_ctx;
 	TALLOC_CTX *mem_ctx;
-	uint32 access_mask;
+	uint32_t access_mask;
 	const char *account_sid;
 	const char *account_name;
 	const char *account_dn;
diff --git a/source4/rpc_server/samr/samdb.c b/source4/rpc_server/samr/samdb.c
index 36aa8be4d4..98374c6c86 100644
--- a/source4/rpc_server/samr/samdb.c
+++ b/source4/rpc_server/samr/samdb.c
@@ -334,8 +334,8 @@ const char *samdb_result_string(struct ldb_message *msg, const char *attr,
 /*
   pull a rid from a objectSid in a result set. 
 */
-uint32 samdb_result_rid_from_sid(TALLOC_CTX *mem_ctx, struct ldb_message *msg, 
-				 const char *attr, uint32 default_value)
+uint32_t samdb_result_rid_from_sid(TALLOC_CTX *mem_ctx, struct ldb_message *msg, 
+				 const char *attr, uint32_t default_value)
 {
 	struct dom_sid *sid;
 	const char *sidstr = ldb_msg_find_string(msg, attr, NULL);
@@ -625,7 +625,7 @@ int samdb_copy_template(void *ctx, TALLOC_CTX *mem_ctx,
   return 0 on failure, the id on success
 */
 static NTSTATUS _samdb_allocate_next_id(void *ctx, TALLOC_CTX *mem_ctx, const char *dn, 
-					const char *attr, uint32 *id)
+					const char *attr, uint32_t *id)
 {
 	struct samdb_context *sam_ctx = ctx;
 	struct ldb_message msg;
@@ -696,7 +696,7 @@ static NTSTATUS _samdb_allocate_next_id(void *ctx, TALLOC_CTX *mem_ctx, const ch
   return 0 on failure, the id on success
 */
 NTSTATUS samdb_allocate_next_id(void *ctx, TALLOC_CTX *mem_ctx, const char *dn, const char *attr,
-				uint32 *id)
+				uint32_t *id)
 {
 	int tries = 10;
 	NTSTATUS status;
@@ -824,7 +824,7 @@ int samdb_msg_add_hashes(void *ctx, TALLOC_CTX *mem_ctx, struct ldb_message *msg
   add a acct_flags element to a message
 */
 int samdb_msg_add_acct_flags(void *ctx, TALLOC_CTX *mem_ctx, struct ldb_message *msg,
-			     const char *attr_name, uint32 v)
+			     const char *attr_name, uint32_t v)
 {
 	return samdb_msg_add_uint(ctx, mem_ctx, msg, attr_name, samdb_acb2uf(v));
 }
diff --git a/source4/rpc_server/samr/samr_password.c b/source4/rpc_server/samr/samr_password.c
index 812e0c69b9..24a467d49f 100644
--- a/source4/rpc_server/samr/samr_password.c
+++ b/source4/rpc_server/samr/samr_password.c
@@ -132,7 +132,7 @@ NTSTATUS samr_OemChangePasswordUser2(struct dcesrv_call_state *dce_call, TALLOC_
 {
 	NTSTATUS status;
 	char new_pass[512];
-	uint32 new_pass_len;
+	uint32_t new_pass_len;
 	struct samr_CryptPassword *pwbuf = r->in.password;
 	void *sam_ctx;
 	const char *user_dn, *domain_dn;
@@ -248,7 +248,7 @@ NTSTATUS samr_ChangePasswordUser3(struct dcesrv_call_state *dce_call,
 {	
 	NTSTATUS status;
 	char new_pass[512];
-	uint32 new_pass_len;
+	uint32_t new_pass_len;
 	void *sam_ctx = NULL;
 	const char *user_dn, *domain_dn = NULL;
 	int ret;
@@ -261,7 +261,7 @@ NTSTATUS samr_ChangePasswordUser3(struct dcesrv_call_state *dce_call,
 	struct samr_Hash *ntPwdHash;
 	struct samr_DomInfo1 *dominfo;
 	struct samr_ChangeReject *reject;
-	uint32 reason = 0;
+	uint32_t reason = 0;
 
 	ZERO_STRUCT(r->out);
 
@@ -424,7 +424,7 @@ NTSTATUS samdb_set_password(void *ctx, TALLOC_CTX *mem_ctx,
 			    struct samr_Hash *lmNewHash, 
 			    struct samr_Hash *ntNewHash,
 			    BOOL user_change,
-			    uint32 *reject_reason)
+			    uint32_t *reject_reason)
 {
 	const char * const user_attrs[] = { "userAccountControl", "lmPwdHistory", 
 					    "ntPwdHistory", "unicodePwd", 
@@ -677,7 +677,7 @@ NTSTATUS samr_set_password(struct dcesrv_call_state *dce_call,
 			   struct samr_CryptPassword *pwbuf)
 {
 	char new_pass[512];
-	uint32 new_pass_len;
+	uint32_t new_pass_len;
 	DATA_BLOB session_key = dce_call->conn->session_key;
 
 	SamOEMhashBlob(pwbuf->data, 516, &session_key);
diff --git a/source4/rpc_server/samr/samr_utils.c b/source4/rpc_server/samr/samr_utils.c
index 247b2d47f4..6b8a2ff19a 100644
--- a/source4/rpc_server/samr/samr_utils.c
+++ b/source4/rpc_server/samr/samr_utils.c
@@ -27,7 +27,7 @@ translated the ACB_CTRL Flags to UserFlags (userAccountControl)
 */ 
 /* mapping between ADS userAccountControl and SAMR acct_flags */
 static const struct {
-	uint32 uf;
+	uint32_t uf;
 	uint16 acb;
 } acct_flags_map[] = {
 	{ UF_ACCOUNTDISABLE, ACB_DISABLED },
@@ -43,9 +43,9 @@ static const struct {
 	{ UF_LOCKOUT, ACB_AUTOLOCK }
 };
 
-uint32 samdb_acb2uf(uint16 acb)
+uint32_t samdb_acb2uf(uint16 acb)
 {
-	uint32 i, ret = 0;
+	uint32_t i, ret = 0;
 	for (i=0;i<ARRAY_SIZE(acct_flags_map);i++) {
 		if (acct_flags_map[i].acb & acb) {
 			ret |= acct_flags_map[i].uf;
@@ -57,9 +57,9 @@ uint32 samdb_acb2uf(uint16 acb)
 /*
 translated the UserFlags (userAccountControl) to ACB_CTRL Flags
 */
-uint16 samdb_uf2acb(uint32 uf)
+uint16 samdb_uf2acb(uint32_t uf)
 {
-	uint32 i;
+	uint32_t i;
 	uint16 ret = 0;
 	for (i=0;i<ARRAY_SIZE(acct_flags_map);i++) {
 		if (acct_flags_map[i].uf & uf) {
@@ -72,9 +72,9 @@ uint16 samdb_uf2acb(uint32 uf)
 /* 
 get the accountType from the UserFlags
 */
-uint32 samdb_uf2atype(uint32 uf)
+uint32_t samdb_uf2atype(uint32_t uf)
 {
-	uint32 atype = 0x00000000;
+	uint32_t atype = 0x00000000;
 		
 	if (uf & UF_NORMAL_ACCOUNT)			atype = ATYPE_NORMAL_ACCOUNT;
 	else if (uf & UF_TEMP_DUPLICATE_ACCOUNT)	atype = ATYPE_NORMAL_ACCOUNT;
@@ -88,9 +88,9 @@ uint32 samdb_uf2atype(uint32 uf)
 /* 
 get the accountType from the groupType
 */
-uint32 samdb_gtype2atype(uint32 gtype)
+uint32_t samdb_gtype2atype(uint32_t gtype)
 {
-	uint32 atype = 0x00000000;
+	uint32_t atype = 0x00000000;
 	
 	switch(gtype) {
 		case GTYPE_SECURITY_BUILTIN_LOCAL_GROUP:
@@ -118,7 +118,7 @@ uint32 samdb_gtype2atype(uint32 gtype)
 }
 
 /* turn a sAMAccountType into a SID_NAME_USE */
-enum SID_NAME_USE samdb_atype_map(uint32 atype)
+enum SID_NAME_USE samdb_atype_map(uint32_t atype)
 {
 	switch (atype & 0xF0000000) {
 	case ATYPE_GLOBAL_GROUP: