r884: convert samba4 to use [u]int32_t instead of [u]int32

metze
(This used to be commit 0e5517d937a2eb7cf707991d1c7498c1ab456095)

7 files changed, 19 insertions, 19 deletions

diff --git a/source4/libcli/auth/credentials.c b/source4/libcli/auth/credentials.c
index 5fa9d5ac4a..139b17d5b3 100644
--- a/source4/libcli/auth/credentials.c
+++ b/source4/libcli/auth/credentials.c
@@ -34,7 +34,7 @@ static void creds_init(struct creds_CredentialState *creds,
 		       const uint8 machine_password[16])
 {
 	struct netr_Credential time_cred;
-	uint32 sum[2];
+	uint32_t sum[2];
 	uint8 sum2[8];
 
 	dump_data_pw("Client chall", client_challenge->data, sizeof(client_challenge->data));
diff --git a/source4/libcli/auth/credentials.h b/source4/libcli/auth/credentials.h
index a7e81d43af..85efd54bc1 100644
--- a/source4/libcli/auth/credentials.h
+++ b/source4/libcli/auth/credentials.h
@@ -22,7 +22,7 @@
 
 struct creds_CredentialState {
 	uint8 session_key[8];
-	uint32 sequence;
+	uint32_t sequence;
 	struct netr_Credential seed;
 	struct netr_Credential client;
 	struct netr_Credential server;
diff --git a/source4/libcli/auth/ntlmssp.c b/source4/libcli/auth/ntlmssp.c
index 3773c8e590..54b219f879 100644
--- a/source4/libcli/auth/ntlmssp.c
+++ b/source4/libcli/auth/ntlmssp.c
@@ -62,7 +62,7 @@ static const struct ntlmssp_callbacks {
  * @param neg_flags The flags from the packet
  */
 
-void debug_ntlmssp_flags(uint32 neg_flags)
+void debug_ntlmssp_flags(uint32_t neg_flags)
 {
 	DEBUG(3,("Got NTLMSSP neg_flags=0x%08x\n", neg_flags));
 	
@@ -222,7 +222,7 @@ NTSTATUS ntlmssp_update(NTLMSSP_STATE *ntlmssp_state,
 			const DATA_BLOB in, DATA_BLOB *out) 
 {
 	DATA_BLOB input;
-	uint32 ntlmssp_command;
+	uint32_t ntlmssp_command;
 	int i;
 
 	*out = data_blob(NULL, 0);
@@ -317,7 +317,7 @@ void ntlmssp_end(NTLMSSP_STATE **ntlmssp_state)
  */
 
 static const char *ntlmssp_target_name(struct ntlmssp_state *ntlmssp_state,
-				       uint32 neg_flags, uint32 *chal_flags) 
+				       uint32_t neg_flags, uint32_t *chal_flags) 
 {
 	if (neg_flags & NTLMSSP_REQUEST_TARGET) {
 		*chal_flags |= NTLMSSP_CHAL_TARGET_INFO;
@@ -335,7 +335,7 @@ static const char *ntlmssp_target_name(struct ntlmssp_state *ntlmssp_state,
 }
 
 static void ntlmssp_handle_neg_flags(struct ntlmssp_state *ntlmssp_state,
-				      uint32 neg_flags, BOOL allow_lm) {
+				      uint32_t neg_flags, BOOL allow_lm) {
 	if (neg_flags & NTLMSSP_NEGOTIATE_UNICODE) {
 		ntlmssp_state->neg_flags |= NTLMSSP_NEGOTIATE_UNICODE;
 		ntlmssp_state->neg_flags &= ~NTLMSSP_NEGOTIATE_OEM;
@@ -427,8 +427,8 @@ static NTSTATUS ntlmssp_server_negotiate(struct ntlmssp_state *ntlmssp_state,
 {
 	DATA_BLOB struct_blob;
 	fstring dnsname, dnsdomname;
-	uint32 neg_flags = 0;
-	uint32 ntlmssp_command, chal_flags;
+	uint32_t neg_flags = 0;
+	uint32_t ntlmssp_command, chal_flags;
 	char *cliname=NULL, *domname=NULL;
 	const uint8 *cryptkey;
 	const char *target_name;
@@ -545,7 +545,7 @@ static NTSTATUS ntlmssp_server_negotiate(struct ntlmssp_state *ntlmssp_state,
 static NTSTATUS ntlmssp_server_preauth(struct ntlmssp_state *ntlmssp_state,
 				       const DATA_BLOB request) 
 {
-	uint32 ntlmssp_command, auth_flags;
+	uint32_t ntlmssp_command, auth_flags;
 	NTSTATUS nt_status;
 
 	uchar session_nonce_hash[16];
@@ -978,7 +978,7 @@ static NTSTATUS ntlmssp_client_challenge(struct ntlmssp_state *ntlmssp_state,
 					 TALLOC_CTX *out_mem_ctx,
 					 const DATA_BLOB in, DATA_BLOB *out) 
 {
-	uint32 chal_flags, ntlmssp_command, unkn1, unkn2;
+	uint32_t chal_flags, ntlmssp_command, unkn1, unkn2;
 	DATA_BLOB server_domain_blob;
 	DATA_BLOB challenge_blob;
 	DATA_BLOB struct_blob = data_blob(NULL, 0);
diff --git a/source4/libcli/auth/ntlmssp.h b/source4/libcli/auth/ntlmssp.h
index d3d39e8465..95713de6c5 100644
--- a/source4/libcli/auth/ntlmssp.h
+++ b/source4/libcli/auth/ntlmssp.h
@@ -77,7 +77,7 @@ typedef struct ntlmssp_state
 	unsigned int ref_count;
 	enum NTLMSSP_ROLE role;
 	enum server_types server_role;
-	uint32 expected_state;
+	uint32_t expected_state;
 
 	BOOL unicode;
 	BOOL use_ntlmv2;
@@ -103,7 +103,7 @@ typedef struct ntlmssp_state
 	DATA_BLOB nt_resp;
 	DATA_BLOB session_key;
 	
-	uint32 neg_flags; /* the current state of negotiation with the NTLMSSP partner */
+	uint32_t neg_flags; /* the current state of negotiation with the NTLMSSP partner */
 
 	/* internal variables used by NTLM2 */
 	BOOL doing_ntlm2; 
@@ -163,7 +163,7 @@ typedef struct ntlmssp_state
 
 	/* SMB Signing */
 	
-	uint32 ntlmssp_seq_num;
+	uint32_t ntlmssp_seq_num;
 
 	/* ntlmv2 */
 	char send_sign_key[16];
diff --git a/source4/libcli/auth/ntlmssp_parse.c b/source4/libcli/auth/ntlmssp_parse.c
index 6ddaeebb06..6d0d644a89 100644
--- a/source4/libcli/auth/ntlmssp_parse.c
+++ b/source4/libcli/auth/ntlmssp_parse.c
@@ -191,8 +191,8 @@ BOOL msrpc_parse(TALLOC_CTX *mem_ctx, const DATA_BLOB *blob,
 	DATA_BLOB *b;
 	size_t head_ofs = 0;
 	uint16 len1, len2;
-	uint32 ptr;
-	uint32 *v;
+	uint32_t ptr;
+	uint32_t *v;
 	pstring p;
 
 	va_start(ap, format);
@@ -296,7 +296,7 @@ BOOL msrpc_parse(TALLOC_CTX *mem_ctx, const DATA_BLOB *blob,
 			head_ofs += len1;
 			break;
 		case 'd':
-			v = va_arg(ap, uint32 *);
+			v = va_arg(ap, uint32_t *);
 			NEED_DATA(4);
 			*v = IVAL(blob->data, head_ofs); head_ofs += 4;
 			break;
diff --git a/source4/libcli/auth/ntlmssp_sign.c b/source4/libcli/auth/ntlmssp_sign.c
index 6abec7e8b6..df7bddcd38 100644
--- a/source4/libcli/auth/ntlmssp_sign.c
+++ b/source4/libcli/auth/ntlmssp_sign.c
@@ -159,7 +159,7 @@ static NTSTATUS ntlmssp_make_packet_signature(NTLMSSP_STATE *ntlmssp_state,
 		memcpy(sig->data + 12, seq_num, 4);
 
 	} else {
-		uint32 crc;
+		uint32_t crc;
 		crc = crc32_calc_buffer((const char *)data, length);
 		if (!msrpc_gen(sig_mem_ctx, sig, "dddd", NTLMSSP_SIGN_VERSION, 0, crc, ntlmssp_state->ntlmssp_seq_num)) {
 			return NT_STATUS_NO_MEMORY;
@@ -302,7 +302,7 @@ NTSTATUS ntlmssp_seal_packet(NTLMSSP_STATE *ntlmssp_state,
 		memcpy(sig->data + 4, digest, 8);
 		memcpy(sig->data + 12, seq_num, 4);
 	} else {
-		uint32 crc;
+		uint32_t crc;
 		crc = crc32_calc_buffer((const char *)data, length);
 		if (!msrpc_gen(sig_mem_ctx, sig, "dddd", NTLMSSP_SIGN_VERSION, 0, crc, ntlmssp_state->ntlmssp_seq_num)) {
 			return NT_STATUS_NO_MEMORY;
diff --git a/source4/libcli/auth/schannel.h b/source4/libcli/auth/schannel.h
index 7b710d7cb9..74507c547d 100644
--- a/source4/libcli/auth/schannel.h
+++ b/source4/libcli/auth/schannel.h
@@ -25,7 +25,7 @@
 struct schannel_state {
 	TALLOC_CTX *mem_ctx;
 	uint8 session_key[16];
-	uint32 seq_num;
+	uint32_t seq_num;
 	BOOL initiator;
 	DATA_BLOB signature;
 };