Attachment 5124 Details for Bug 6842 – Change uint_t to unsigned int in libcli

[patch] Change uint_t to unsigned int in libcli

0004-Change-uint_t-to-unsigned-int-in-libcli.patch (text/plain), 3.08 KB, created by Matt Kraai (mail address dead) on 2010-01-05 11:00:29 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Matt Kraai (mail address dead)

Created: 2010-01-05 11:00:29 UTC

Size: 3.08 KB

patch

obsolete

>From 0ce2e0c0ac15751b9838c31a6e516a269e3467a7 Mon Sep 17 00:00:00 2001
>From: Matt Kraai <mkraai@beckman.com>
>Date: Tue, 5 Jan 2010 09:41:24 -0800
>Subject: [PATCH 4/8] Change uint_t to unsigned int in libcli
>
>---
> libcli/auth/msrpc_parse.c |    2 +-
> libcli/auth/proto.h       |    2 +-
> libcli/auth/smbdes.c      |    2 +-
> libcli/nbt/nbtname.c      |    2 +-
> libcli/security/dom_sid.c |    2 +-
> 5 files changed, 5 insertions(+), 5 deletions(-)
>
>diff --git a/libcli/auth/msrpc_parse.c b/libcli/auth/msrpc_parse.c
>index 50e0d5c..336611d 100644
>--- a/libcli/auth/msrpc_parse.c
>+++ b/libcli/auth/msrpc_parse.c
>@@ -333,7 +333,7 @@ bool msrpc_parse(TALLOC_CTX *mem_ctx,
> 			break;
> 		case 'b':
> 			b = (DATA_BLOB *)va_arg(ap, void *);
>-			len1 = va_arg(ap, uint_t);
>+			len1 = va_arg(ap, unsigned int);
> 			/* make sure its in the right format - be strict */
> 			NEED_DATA(len1);
> 			if (blob->data + head_ofs < (uint8_t *)head_ofs ||
>diff --git a/libcli/auth/proto.h b/libcli/auth/proto.h
>index e09cdee..2ab795f 100644
>--- a/libcli/auth/proto.h
>+++ b/libcli/auth/proto.h
>@@ -193,7 +193,7 @@ void des_crypt128(uint8_t out[8], const uint8_t in[8], const uint8_t key[16]);
> void des_crypt64(uint8_t out[8], const uint8_t in[8], const uint8_t key[8], int forw);
> void des_crypt112(uint8_t out[8], const uint8_t in[8], const uint8_t key[14], int forw);
> void des_crypt112_16(uint8_t out[16], uint8_t in[16], const uint8_t key[14], int forw);
>-void sam_rid_crypt(uint_t rid, const uint8_t *in, uint8_t *out, int forw);
>+void sam_rid_crypt(unsigned int rid, const uint8_t *in, uint8_t *out, int forw);
> #undef _PRINTF_ATTRIBUTE
> #define _PRINTF_ATTRIBUTE(a1, a2)
> 
>diff --git a/libcli/auth/smbdes.c b/libcli/auth/smbdes.c
>index 32e65e7..f052b27 100644
>--- a/libcli/auth/smbdes.c
>+++ b/libcli/auth/smbdes.c
>@@ -367,7 +367,7 @@ void des_crypt112_16(uint8_t out[16], uint8_t in[16], const uint8_t key[14], int
> /* Decode a sam password hash into a password.  The password hash is the
>    same method used to store passwords in the NT registry.  The DES key
>    used is based on the RID of the user. */
>-void sam_rid_crypt(uint_t rid, const uint8_t *in, uint8_t *out, int forw)
>+void sam_rid_crypt(unsigned int rid, const uint8_t *in, uint8_t *out, int forw)
> {
> 	uint8_t s[14];
> 
>diff --git a/libcli/nbt/nbtname.c b/libcli/nbt/nbtname.c
>index 338cb21..a200135 100644
>--- a/libcli/nbt/nbtname.c
>+++ b/libcli/nbt/nbtname.c
>@@ -48,7 +48,7 @@ static enum ndr_err_code ndr_pull_component(struct ndr_pull *ndr,
> 					    uint32_t *max_offset)
> {
> 	uint8_t len;
>-	uint_t loops = 0;
>+	unsigned int loops = 0;
> 	while (loops < 5) {
> 		if (*offset >= ndr->data_size) {
> 			return ndr_pull_error(ndr, NDR_ERR_STRING,
>diff --git a/libcli/security/dom_sid.c b/libcli/security/dom_sid.c
>index 0c88900..ef534e3 100644
>--- a/libcli/security/dom_sid.c
>+++ b/libcli/security/dom_sid.c
>@@ -91,7 +91,7 @@ bool dom_sid_equal(const struct dom_sid *sid1, const struct dom_sid *sid2)
> 
> bool dom_sid_parse(const char *sidstr, struct dom_sid *ret)
> {
>-	uint_t rev, ia, num_sub_auths, i;
>+	unsigned int rev, ia, num_sub_auths, i;
> 	char *p;
> 
> 	if (strncasecmp(sidstr, "S-", 2)) {
>-- 
>1.6.6
>

Actions: View

Attachments on bug 6842: 5099 | 5100 | 5121 | 5122 | 5123 | 5124 | 5125 | 5126 | 5127 | 5128