[SCM] Samba Shared Repository - branch master updated
Stefan Metzmacher
metze at samba.org
Tue Feb 2 00:14:39 MST 2010
The branch, master has been updated
via d8071e7... Change uint_t to unsigned int in source4
via a47b6eb... Change uint_t to unsigned int in source3
via 3ee9d1a... Change uint_t to unsigned int in pidl
via aa6a507... Change uint_t to unsigned int in libcli
via a7250eb... Change uint_t to unsigned int in lib/util
via 2cb2d53... Change uint_t to unsigned int in lib/talloc
via d4fc2e8... Change uint_t to unsigned int in lib/crypto
via a2c95a5... Change uint_t to unsigned int in lib/replace
via e3aeea2... s4:NBT-WINSREPLICATION: don't mark a local variable as static
from 86bf5ea... Add debug to make it clear when EA dosmode set is invoked.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit d8071e7ed7c57e8b0f2d80420e27f9ea7ab63022
Author: Matt Kraai <mkraai at beckman.com>
Date: Tue Jan 5 09:42:54 2010 -0800
Change uint_t to unsigned int in source4
Signed-off-by: Stefan Metzmacher <metze at samba.org>
commit a47b6ebb3036f5073fdb2320b584345d3604c38d
Author: Matt Kraai <mkraai at beckman.com>
Date: Tue Jan 5 09:42:23 2010 -0800
Change uint_t to unsigned int in source3
Signed-off-by: Stefan Metzmacher <metze at samba.org>
commit 3ee9d1a3d1e934eccd0846b4dac30aae40dc70f8
Author: Matt Kraai <mkraai at beckman.com>
Date: Tue Jan 5 09:41:53 2010 -0800
Change uint_t to unsigned int in pidl
Signed-off-by: Stefan Metzmacher <metze at samba.org>
commit aa6a507e76685f2a8d1f3bd33cbf0fbdeb0d69ce
Author: Matt Kraai <mkraai at beckman.com>
Date: Tue Jan 5 09:41:24 2010 -0800
Change uint_t to unsigned int in libcli
Signed-off-by: Stefan Metzmacher <metze at samba.org>
commit a7250eb14270101d4ca580acd8fdcaf7e308e515
Author: Matt Kraai <mkraai at beckman.com>
Date: Tue Jan 5 09:40:54 2010 -0800
Change uint_t to unsigned int in lib/util
Signed-off-by: Stefan Metzmacher <metze at samba.org>
commit 2cb2d5317f8428b5eaef2365c815aa34739a80b5
Author: Matt Kraai <mkraai at beckman.com>
Date: Tue Jan 5 09:40:26 2010 -0800
Change uint_t to unsigned int in lib/talloc
Signed-off-by: Stefan Metzmacher <metze at samba.org>
commit d4fc2e82012277e5e8570da5d08d62c6847a99c0
Author: Matt Kraai <mkraai at beckman.com>
Date: Tue Jan 5 09:39:56 2010 -0800
Change uint_t to unsigned int in lib/crypto
Signed-off-by: Stefan Metzmacher <metze at samba.org>
commit a2c95a5d961594f2accbb032cd7e8da9767e2e47
Author: Matt Kraai <mkraai at beckman.com>
Date: Tue Jan 5 09:43:24 2010 -0800
Change uint_t to unsigned int in lib/replace
Signed-off-by: Stefan Metzmacher <metze at samba.org>
commit e3aeea29a4e730ccbe7367645703cdc9ee8e7a7e
Author: Stefan Metzmacher <metze at samba.org>
Date: Mon Feb 1 17:30:30 2010 +0100
s4:NBT-WINSREPLICATION: don't mark a local variable as static
This was somehow introduced in commit 8773e743c518578584d07d35ffdafdd598af88b0.
metze
-----------------------------------------------------------------------
Summary of changes:
lib/crypto/md5.c | 8 ++--
lib/replace/README | 1 -
lib/replace/getifaddrs.c | 2 +-
lib/replace/libreplace_cc.m4 | 1 -
lib/replace/test/testsuite.c | 1 -
lib/talloc/talloc.3.xml | 6 ++--
lib/talloc/talloc_guide.txt | 6 ++--
lib/util/asn1.c | 4 +-
lib/util/byteorder.h | 4 +-
lib/util/charset/iconv.c | 2 +-
lib/util/util_str.c | 2 +-
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 +-
pidl/tests/Util.pm | 1 -
source3/include/proto.h | 8 ++--
source3/libsmb/clirap2.c | 8 ++--
source4/client/client.c | 4 +-
source4/dsdb/common/util.c | 16 ++++----
source4/dsdb/samdb/ldb_modules/password_hash.c | 4 +-
source4/lib/messaging/messaging.c | 2 +-
source4/libcli/clifile.c | 6 ++--
source4/libcli/raw/interfaces.h | 20 +++++-----
source4/libcli/raw/libcliraw.h | 34 +++++++++---------
source4/libcli/raw/raweas.c | 44 ++++++++++++------------
source4/libcli/raw/rawfile.c | 4 +-
source4/libcli/raw/rawfileinfo.c | 2 +-
source4/libcli/raw/rawrequest.c | 38 ++++++++++----------
source4/libcli/raw/rawsearch.c | 12 +++---
source4/libcli/raw/rawsetfileinfo.c | 2 +-
source4/libcli/raw/rawtrans.c | 2 +-
source4/libcli/raw/request.h | 2 +-
source4/libcli/raw/smb_signing.c | 2 +-
source4/libcli/security/privilege.c | 2 +-
source4/libcli/smb2/find.c | 6 ++--
source4/libcli/smb2/smb2.h | 2 +-
source4/libcli/smb2/util.c | 2 +-
source4/librpc/rpc/dcerpc.c | 4 +-
source4/ntvfs/cifs_posix_cli/svfs_util.c | 4 +-
source4/ntvfs/cifs_posix_cli/vfs_cifs_posix.c | 4 +-
source4/ntvfs/ntvfs_generic.c | 8 ++--
source4/ntvfs/posix/pvfs_fileinfo.c | 2 +-
source4/ntvfs/posix/pvfs_fsinfo.c | 2 +-
source4/ntvfs/posix/pvfs_qfileinfo.c | 2 +-
source4/ntvfs/posix/pvfs_resolve.c | 12 +++---
source4/ntvfs/posix/pvfs_search.c | 16 ++++----
source4/ntvfs/posix/vfs_posix.h | 12 +++---
source4/ntvfs/simple/svfs_util.c | 4 +-
source4/ntvfs/simple/vfs_simple.c | 4 +-
source4/ntvfs/smb2/vfs_smb2.c | 2 +-
source4/ntvfs/unixuid/vfs_unixuid.c | 2 +-
source4/smb_server/blob.c | 8 ++--
source4/smb_server/smb/nttrans.c | 2 +-
source4/smb_server/smb/reply.c | 6 ++--
source4/smb_server/smb/request.c | 22 ++++++------
source4/smb_server/smb/trans2.c | 6 ++--
source4/smb_server/smb2/tcon.c | 4 +-
source4/torture/basic/attr.c | 6 ++--
source4/torture/basic/base.c | 2 +-
source4/torture/basic/denytest.c | 6 ++--
source4/torture/basic/locking.c | 4 +-
source4/torture/basic/mangle_test.c | 6 ++--
source4/torture/basic/misc.c | 2 +-
source4/torture/gentest.c | 40 +++++++++++-----------
source4/torture/locktest.c | 12 +++---
source4/torture/locktest2.c | 22 ++++++------
source4/torture/nbench/nbio.c | 22 ++++++------
source4/torture/nbt/winsreplication.c | 2 +-
source4/torture/raw/qfileinfo.c | 40 +++++++++++-----------
source4/torture/raw/qfsinfo.c | 12 +++---
source4/torture/raw/read.c | 12 +++---
source4/torture/raw/samba3misc.c | 8 ++--
source4/torture/raw/setfileinfo.c | 6 ++--
source4/torture/raw/write.c | 12 +++---
source4/torture/rpc/echo.c | 10 +++---
source4/torture/rpc/lsa.c | 4 +-
source4/torture/rpc/session_key.c | 2 +-
source4/torture/smb2/dir.c | 14 ++++----
source4/torture/smb2/setinfo.c | 6 ++--
81 files changed, 321 insertions(+), 325 deletions(-)
Changeset truncated at 500 lines:
diff --git a/lib/crypto/md5.c b/lib/crypto/md5.c
index 584c46e..566aaca 100644
--- a/lib/crypto/md5.c
+++ b/lib/crypto/md5.c
@@ -28,12 +28,12 @@ static void MD5Transform(uint32_t buf[4], uint32_t const in[16]);
/*
* Note: this code is harmless on little-endian machines.
*/
-static void byteReverse(uint8_t *buf, uint_t longs)
+static void byteReverse(uint8_t *buf, unsigned int longs)
{
uint32_t t;
do {
- t = (uint32_t) ((uint_t) buf[3] << 8 | buf[2]) << 16 |
- ((uint_t) buf[1] << 8 | buf[0]);
+ t = (uint32_t) ((unsigned int) buf[3] << 8 | buf[2]) << 16 |
+ ((unsigned int) buf[1] << 8 | buf[0]);
*(uint32_t *) buf = t;
buf += 4;
} while (--longs);
@@ -108,7 +108,7 @@ _PUBLIC_ void MD5Update(struct MD5Context *ctx, const uint8_t *buf, size_t len)
*/
_PUBLIC_ void MD5Final(uint8_t digest[16], struct MD5Context *ctx)
{
- uint_t count;
+ unsigned int count;
uint8_t *p;
/* Compute number of bytes mod 64 */
diff --git a/lib/replace/README b/lib/replace/README
index 26383bc..b2d2e4f 100644
--- a/lib/replace/README
+++ b/lib/replace/README
@@ -75,7 +75,6 @@ realpath
Types:
bool
socklen_t
-uint_t
uint{8,16,32,64}_t
int{8,16,32,64}_t
intptr_t
diff --git a/lib/replace/getifaddrs.c b/lib/replace/getifaddrs.c
index 3a91bb4..84d7906 100644
--- a/lib/replace/getifaddrs.c
+++ b/lib/replace/getifaddrs.c
@@ -282,7 +282,7 @@ int rep_getifaddrs(struct ifaddrs **ifap)
i = ifc.ifc_len;
while (i > 0) {
- uint_t inc;
+ unsigned int inc;
inc = ifr->ifr_addr.sa_len;
diff --git a/lib/replace/libreplace_cc.m4 b/lib/replace/libreplace_cc.m4
index a26dee4..48d9e84 100644
--- a/lib/replace/libreplace_cc.m4
+++ b/lib/replace/libreplace_cc.m4
@@ -115,7 +115,6 @@ AC_CHECK_SIZEOF(short)
AC_CHECK_SIZEOF(long)
AC_CHECK_SIZEOF(long long)
-AC_CHECK_TYPE(uint_t, unsigned int)
AC_CHECK_TYPE(int8_t, char)
AC_CHECK_TYPE(uint8_t, unsigned char)
AC_CHECK_TYPE(int16_t, short)
diff --git a/lib/replace/test/testsuite.c b/lib/replace/test/testsuite.c
index caa70d6..829e9f9 100644
--- a/lib/replace/test/testsuite.c
+++ b/lib/replace/test/testsuite.c
@@ -751,7 +751,6 @@ FIXME:
Types:
bool
socklen_t
-uint_t
uint{8,16,32,64}_t
int{8,16,32,64}_t
intptr_t
diff --git a/lib/talloc/talloc.3.xml b/lib/talloc/talloc.3.xml
index 8d9e082..cc36f60 100644
--- a/lib/talloc/talloc.3.xml
+++ b/lib/talloc/talloc.3.xml
@@ -689,7 +689,7 @@ if (ptr) memcpy(ptr, p, strlen(p)+1);</programlisting>
</para>
<programlisting>talloc_set_name_const(ptr, ptr)</programlisting>
</refsect2>
- <refsect2><title>(type *)talloc_array(const void *ctx, type, uint_t count);</title>
+ <refsect2><title>(type *)talloc_array(const void *ctx, type, unsigned int count);</title>
<para>
The talloc_array() macro is equivalent to:
</para>
@@ -699,14 +699,14 @@ if (ptr) memcpy(ptr, p, strlen(p)+1);</programlisting>
multiply, returning NULL if the multiply overflows.
</para>
</refsect2>
- <refsect2><title>void *talloc_array_size(const void *ctx, size_t size, uint_t count);</title>
+ <refsect2><title>void *talloc_array_size(const void *ctx, size_t size, unsigned int count);</title>
<para>
The talloc_array_size() function is useful when the type is not
known. It operates in the same way as talloc_array(), but takes a
size instead of a type.
</para>
</refsect2>
- <refsect2><title>(typeof(ptr)) talloc_array_ptrtype(const void *ctx, ptr, uint_t count);</title>
+ <refsect2><title>(typeof(ptr)) talloc_array_ptrtype(const void *ctx, ptr, unsigned int count);</title>
<para>
The talloc_ptrtype() macro should be used when you have a pointer to an array
and want to allocate memory of an array to point at with this pointer. When compiling
diff --git a/lib/talloc/talloc_guide.txt b/lib/talloc/talloc_guide.txt
index 01de806..79387bf 100644
--- a/lib/talloc/talloc_guide.txt
+++ b/lib/talloc/talloc_guide.txt
@@ -652,7 +652,7 @@ string. This is equivalent to::
=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
-((type *)talloc_array(const void *ctx, type, uint_t count);
+((type *)talloc_array(const void *ctx, type, unsigned int count);
The talloc_array() macro is equivalent to::
@@ -663,14 +663,14 @@ returning NULL if the multiply overflows.
=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
-void *talloc_array_size(const void *ctx, size_t size, uint_t count);
+void *talloc_array_size(const void *ctx, size_t size, unsigned int count);
The talloc_array_size() function is useful when the type is not
known. It operates in the same way as talloc_array(), but takes a size
instead of a type.
=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
-(typeof(ptr)) talloc_array_ptrtype(const void *ctx, ptr, uint_t count);
+(typeof(ptr)) talloc_array_ptrtype(const void *ctx, ptr, unsigned int count);
The talloc_ptrtype() macro should be used when you have a pointer to an array
and want to allocate memory of an array to point at with this pointer. When compiling
diff --git a/lib/util/asn1.c b/lib/util/asn1.c
index 946f713..9e3d3ee 100644
--- a/lib/util/asn1.c
+++ b/lib/util/asn1.c
@@ -216,7 +216,7 @@ bool asn1_write_BitString(struct asn1_data *data, const void *p, size_t length,
bool ber_write_OID_String(TALLOC_CTX *mem_ctx, DATA_BLOB *blob, const char *OID)
{
- uint_t v, v2;
+ unsigned int v, v2;
const char *p = (const char *)OID;
char *newp;
int i;
@@ -588,7 +588,7 @@ static bool _ber_read_OID_String_impl(TALLOC_CTX *mem_ctx, DATA_BLOB blob,
{
int i;
uint8_t *b;
- uint_t v;
+ unsigned int v;
char *tmp_oid = NULL;
if (blob.length < 2) return false;
diff --git a/lib/util/byteorder.h b/lib/util/byteorder.h
index b860dea..f0a000a 100644
--- a/lib/util/byteorder.h
+++ b/lib/util/byteorder.h
@@ -54,7 +54,7 @@ that don't have any int types that are 2 bytes long)
You do this:
#define CVAL(buf,pos) (((uint8_t *)(buf))[pos])
-#define PVAL(buf,pos) ((uint_t)CVAL(buf,pos))
+#define PVAL(buf,pos) ((unsigned int)CVAL(buf,pos))
#define SVAL(buf,pos) (PVAL(buf,pos)|PVAL(buf,(pos)+1)<<8)
then to extract a uint16_t value at offset 25 in a buffer you do this:
@@ -144,7 +144,7 @@ static __inline__ void st_le32(uint32_t *addr, const uint32_t val)
#define CAREFUL_ALIGNMENT 1
#endif
-#define CVAL(buf,pos) ((uint_t)(((const uint8_t *)(buf))[pos]))
+#define CVAL(buf,pos) ((unsigned int)(((const uint8_t *)(buf))[pos]))
#define CVAL_NC(buf,pos) (((uint8_t *)(buf))[pos]) /* Non-const version of CVAL */
#define PVAL(buf,pos) (CVAL(buf,pos))
#define SCVAL(buf,pos,val) (CVAL_NC(buf,pos) = (val))
diff --git a/lib/util/charset/iconv.c b/lib/util/charset/iconv.c
index 8256dc6..2dac333 100644
--- a/lib/util/charset/iconv.c
+++ b/lib/util/charset/iconv.c
@@ -355,7 +355,7 @@ static size_t ucs2hex_pull(void *cd, const char **inbuf, size_t *inbytesleft,
char **outbuf, size_t *outbytesleft)
{
while (*inbytesleft >= 1 && *outbytesleft >= 2) {
- uint_t v;
+ unsigned int v;
if ((*inbuf)[0] != '@') {
/* seven bit ascii case */
diff --git a/lib/util/util_str.c b/lib/util/util_str.c
index a2c50fd..0ea71a8 100644
--- a/lib/util/util_str.c
+++ b/lib/util/util_str.c
@@ -64,7 +64,7 @@ _PUBLIC_ char *safe_strcpy(char *dest,const char *src, size_t maxlength)
if (len > maxlength) {
DEBUG(0,("ERROR: string overflow by %u (%u - %u) in safe_strcpy [%.50s]\n",
- (uint_t)(len-maxlength), (unsigned)len, (unsigned)maxlength, src));
+ (unsigned int)(len-maxlength), (unsigned)len, (unsigned)maxlength, src));
len = maxlength;
}
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 136379a..f890b91 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)) {
diff --git a/pidl/tests/Util.pm b/pidl/tests/Util.pm
index ff876ec..63949eb 100644
--- a/pidl/tests/Util.pm
+++ b/pidl/tests/Util.pm
@@ -76,7 +76,6 @@ SKIP: {
}
my $main = "
-#define uint_t unsigned int
#include <stdint.h>
#include <stdlib.h>
#include <stdio.h>
diff --git a/source3/include/proto.h b/source3/include/proto.h
index fa4a40c..8a17039 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -2879,14 +2879,14 @@ bool cli_ns_check_server_type(struct cli_state *cli, char *workgroup, uint32 sty
bool cli_NetWkstaUserLogoff(struct cli_state *cli, const char *user, const char *workstation);
int cli_NetPrintQEnum(struct cli_state *cli,
void (*qfn)(const char*,uint16,uint16,uint16,const char*,const char*,const char*,const char*,const char*,uint16,uint16),
- void (*jfn)(uint16,const char*,const char*,const char*,const char*,uint16,uint16,const char*,uint_t,uint_t,const char*));
+ void (*jfn)(uint16,const char*,const char*,const char*,const char*,uint16,uint16,const char*,unsigned int,unsigned int,const char*));
int cli_NetPrintQGetInfo(struct cli_state *cli, const char *printer,
void (*qfn)(const char*,uint16,uint16,uint16,const char*,const char*,const char*,const char*,const char*,uint16,uint16),
- void (*jfn)(uint16,const char*,const char*,const char*,const char*,uint16,uint16,const char*,uint_t,uint_t,const char*));
+ void (*jfn)(uint16,const char*,const char*,const char*,const char*,uint16,uint16,const char*,unsigned int,unsigned int,const char*));
int cli_RNetServiceEnum(struct cli_state *cli, void (*fn)(const char *, const char *, void *), void *state);
-int cli_NetSessionEnum(struct cli_state *cli, void (*fn)(char *, char *, uint16, uint16, uint16, uint_t, uint_t, uint_t, char *));
+int cli_NetSessionEnum(struct cli_state *cli, void (*fn)(char *, char *, uint16, uint16, uint16, unsigned int, unsigned int, unsigned int, char *));
int cli_NetSessionGetInfo(struct cli_state *cli, const char *workstation,
- void (*fn)(const char *, const char *, uint16, uint16, uint16, uint_t, uint_t, uint_t, const char *));
+ void (*fn)(const char *, const char *, uint16, uint16, uint16, unsigned int, unsigned int, unsigned int, const char *));
int cli_NetSessionDel(struct cli_state *cli, const char *workstation);
int cli_NetConnectionEnum(struct cli_state *cli, const char *qualifier,
void (*fn)(uint16_t conid, uint16_t contype,
diff --git a/source3/libsmb/clirap2.c b/source3/libsmb/clirap2.c
index 4fd9dc6..763faa7 100644
--- a/source3/libsmb/clirap2.c
+++ b/source3/libsmb/clirap2.c
@@ -1899,7 +1899,7 @@ bool cli_NetWkstaUserLogoff(struct cli_state *cli, const char *user, const char
int cli_NetPrintQEnum(struct cli_state *cli,
void (*qfn)(const char*,uint16,uint16,uint16,const char*,const char*,const char*,const char*,const char*,uint16,uint16),
- void (*jfn)(uint16,const char*,const char*,const char*,const char*,uint16,uint16,const char*,uint_t,uint_t,const char*))
+ void (*jfn)(uint16,const char*,const char*,const char*,const char*,uint16,uint16,const char*,unsigned int,unsigned int,const char*))
{
char param[WORDSIZE /* api number */
+sizeof(RAP_NetPrintQEnum_REQ) /* req string */
@@ -2075,7 +2075,7 @@ int cli_NetPrintQEnum(struct cli_state *cli,
int cli_NetPrintQGetInfo(struct cli_state *cli, const char *printer,
void (*qfn)(const char*,uint16,uint16,uint16,const char*,const char*,const char*,const char*,const char*,uint16,uint16),
- void (*jfn)(uint16,const char*,const char*,const char*,const char*,uint16,uint16,const char*,uint_t,uint_t,const char*))
+ void (*jfn)(uint16,const char*,const char*,const char*,const char*,uint16,uint16,const char*,unsigned int,unsigned int,const char*))
{
char param[WORDSIZE /* api number */
+sizeof(RAP_NetPrintQGetInfo_REQ) /* req string */
@@ -2335,7 +2335,7 @@ int cli_RNetServiceEnum(struct cli_state *cli, void (*fn)(const char *, const ch
Call a NetSessionEnum - list workstations with sessions to an SMB server.
****************************************************************************/
-int cli_NetSessionEnum(struct cli_state *cli, void (*fn)(char *, char *, uint16, uint16, uint16, uint_t, uint_t, uint_t, char *))
+int cli_NetSessionEnum(struct cli_state *cli, void (*fn)(char *, char *, uint16, uint16, uint16, unsigned int, unsigned int, unsigned int, char *))
{
char param[WORDSIZE /* api number */
+sizeof(RAP_NetSessionEnum_REQ) /* parm string */
@@ -2435,7 +2435,7 @@ int cli_NetSessionEnum(struct cli_state *cli, void (*fn)(char *, char *, uint16,
****************************************************************************/
int cli_NetSessionGetInfo(struct cli_state *cli, const char *workstation,
- void (*fn)(const char *, const char *, uint16, uint16, uint16, uint_t, uint_t, uint_t, const char *))
+ void (*fn)(const char *, const char *, uint16, uint16, uint16, unsigned int, unsigned int, unsigned int, const char *))
{
char param[WORDSIZE /* api number */
+sizeof(RAP_NetSessionGetInfo_REQ) /* req string */
diff --git a/source4/client/client.c b/source4/client/client.c
index 71e666b..1958dfc 100644
--- a/source4/client/client.c
+++ b/source4/client/client.c
@@ -72,9 +72,9 @@ struct smbclient_context {
/* timing globals */
static uint64_t get_total_size = 0;
-static uint_t get_total_time_ms = 0;
+static unsigned int get_total_time_ms = 0;
static uint64_t put_total_size = 0;
-static uint_t put_total_time_ms = 0;
+static unsigned int put_total_time_ms = 0;
/* Unfortunately, there is no way to pass the a context to the completion function as an argument */
static struct smbclient_context *rl_ctx;
diff --git a/source4/dsdb/common/util.c b/source4/dsdb/common/util.c
index b57d383..8de4472 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 df4a344..cd58821 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;
diff --git a/source4/lib/messaging/messaging.c b/source4/lib/messaging/messaging.c
index c12945b..c507eb6 100644
--- a/source4/lib/messaging/messaging.c
+++ b/source4/lib/messaging/messaging.c
@@ -98,7 +98,7 @@ static void ping_message(struct messaging_context *msg, void *private_data,
uint32_t msg_type, struct server_id src, DATA_BLOB *data)
{
DEBUG(1,("INFO: Received PING message from server %u.%u [%.*s]\n",
- (uint_t)src.node, (uint_t)src.id, (int)data->length,
+ (unsigned int)src.node, (unsigned int)src.id, (int)data->length,
data->data?(const char *)data->data:""));
messaging_send(msg, src, MSG_PONG, data);
}
diff --git a/source4/libcli/clifile.c b/source4/libcli/clifile.c
index b76bdc0..f521b5f 100644
--- a/source4/libcli/clifile.c
+++ b/source4/libcli/clifile.c
@@ -55,7 +55,7 @@ static NTSTATUS smbcli_link_internal(struct smbcli_tree *tree,
****************************************************************************/
uint32_t unix_perms_to_wire(mode_t perms)
{
- uint_t ret = 0;
+ unsigned int ret = 0;
ret |= ((perms & S_IXOTH) ? UNIX_X_OTH : 0);
ret |= ((perms & S_IWOTH) ? UNIX_W_OTH : 0);
@@ -271,8 +271,8 @@ int smbcli_open(struct smbcli_tree *tree, const char *fname, int flags,
int share_mode)
{
union smb_open open_parms;
- uint_t openfn=0;
- uint_t accessmode=0;
+ unsigned int openfn=0;
+ unsigned int accessmode=0;
TALLOC_CTX *mem_ctx;
NTSTATUS status;
diff --git a/source4/libcli/raw/interfaces.h b/source4/libcli/raw/interfaces.h
index 4ddfc56..f159074 100644
--- a/source4/libcli/raw/interfaces.h
+++ b/source4/libcli/raw/interfaces.h
@@ -185,7 +185,7 @@ union smb_mkdir {
enum smb_mkdir_level level;
struct {
const char *path;
- uint_t num_eas;
+ unsigned int num_eas;
struct ea_struct *eas;
} in;
} t2mkdir;
@@ -488,7 +488,7 @@ union smb_fileinfo {
struct {
uint32_t attrib;
uint32_t ea_size;
- uint_t num_eas;
+ unsigned int num_eas;
struct ea_struct {
uint8_t flags;
struct smb_wire_string name;
@@ -516,7 +516,7 @@ union smb_fileinfo {
uint32_t mode;
--
Samba Shared Repository
More information about the samba-cvs
mailing list