r5137: fix types

metze
(This used to be commit add1c579375d08040f722946da31ee3862f9e7ac)

diff --git a/source4/auth/auth.h b/source4/auth/auth.h
index e78b21339f3cdd3eab510ebbdfb94e6b43af6272..425410e0888e20728302f1b4de08e7536adad0b1 100644 (file)
--- a/source4/auth/auth.h
+++ b/source4/auth/auth.h
@@ -85,10 +85,10 @@ struct auth_serversupplied_info
        NTTIME allow_password_change;
        NTTIME force_password_change;
 
-       uint16 logon_count;
-       uint16 bad_password_count;
+       uint16_t logon_count;
+       uint16_t bad_password_count;
 
-       uint32 acct_flags;
+       uint32_t acct_flags;
 
        BOOL authenticated;
 };

diff --git a/source4/auth/auth_util.c b/source4/auth/auth_util.c
index 34aa632c3af62f3ecb4ca90a232a11925a0a7ef8..d80e5fdb78c66bee308677dd39dd3461877365f2 100644 (file)
--- a/source4/auth/auth_util.c
+++ b/source4/auth/auth_util.c
@@ -273,7 +273,7 @@ NTSTATUS make_user_info_anonymous(TALLOC_CTX *mem_ctx, struct auth_usersupplied_
 ***************************************************************************/
 NTSTATUS make_server_info_netlogon_validation(TALLOC_CTX *mem_ctx,
                                              const char *account_name,
-                                             uint16 validation_level,
+                                             uint16_t validation_level,
                                              union netr_Validation *validation,
                                              struct auth_serversupplied_info **_server_info)
 {

diff --git a/source4/libcli/ldap/ldap.c b/source4/libcli/ldap/ldap.c
index eab94bb1949a01f65392c152bf7a3921d43e4fbd..655838b64f01d4ec0f29649446ccdcb92d5b8403 100644 (file)
--- a/source4/libcli/ldap/ldap.c
+++ b/source4/libcli/ldap/ldap.c
@@ -1220,7 +1220,7 @@ BOOL ldap_decode(struct asn1_data *data, struct ldap_message *msg)
 }
 
 BOOL ldap_parse_basic_url(TALLOC_CTX *mem_ctx, const char *url,
-                         char **host, uint16 *port, BOOL *ldaps)
+                         char **host, uint16_t *port, BOOL *ldaps)
 {
        int tmp_port = 0;
        char protocol[11];

diff --git a/source4/libcli/security/security_descriptor.c b/source4/libcli/security/security_descriptor.c
index bbfee31fbe0c0221dc4dbea92436538f1267f91d..77d296235a02bb24e7dbc1d3e7c898b2dc525f22 100644 (file)
--- a/source4/libcli/security/security_descriptor.c
+++ b/source4/libcli/security/security_descriptor.c
@@ -194,7 +194,7 @@ BOOL security_descriptor_equal(const struct security_descriptor *sd1,
 */
 BOOL security_descriptor_mask_equal(const struct security_descriptor *sd1, 
                                    const struct security_descriptor *sd2, 
-                                   uint32 mask)
+                                   uint32_t mask)
 {
        if (sd1 == sd2) return True;
        if (!sd1 || !sd2) return False;

diff --git a/source4/librpc/rpc/dcerpc.c b/source4/librpc/rpc/dcerpc.c
index bdf9cb2581c983ac208efc2d522488cb1f5185f4..04a13b0100efc19982fbb75242e62a0857ed0032 100644 (file)
--- a/source4/librpc/rpc/dcerpc.c
+++ b/source4/librpc/rpc/dcerpc.c
@@ -1328,7 +1328,7 @@ const char *dcerpc_server_name(struct dcerpc_pipe *p)
 /*
   get the dcerpc auth_level for a open connection
 */
-uint32 dcerpc_auth_level(struct dcerpc_connection *c) 
+uint32_t dcerpc_auth_level(struct dcerpc_connection *c) 
 {
        uint8_t auth_level;
 

diff --git a/source4/librpc/rpc/dcerpc_schannel.c b/source4/librpc/rpc/dcerpc_schannel.c
index 7cd2d1654f19d75b4778d349ce7478a6e019ebc4..a6262d85f0e5a56a3e594ee5bffc5078e2d8f1d9 100644 (file)
--- a/source4/librpc/rpc/dcerpc_schannel.c
+++ b/source4/librpc/rpc/dcerpc_schannel.c
@@ -501,7 +501,7 @@ NTSTATUS dcerpc_bind_auth_schannel(struct dcerpc_pipe *p,
 }
 
 static BOOL dcerpc_schannel_have_feature(struct gensec_security *gensec_security,
-                                         uint32 feature)
+                                         uint32_t feature)
 {
        if (feature & (GENSEC_FEATURE_SESSION_KEY | 
                       GENSEC_FEATURE_SIGN | 

diff --git a/source4/librpc/rpc/dcerpc_smb.c b/source4/librpc/rpc/dcerpc_smb.c
index 8d049ad9678e092608444aa5b80bd09965cf375d..aa2d0bf20f023cf17c6ea289d4075dabdddf0ef0 100644 (file)
--- a/source4/librpc/rpc/dcerpc_smb.c
+++ b/source4/librpc/rpc/dcerpc_smb.c
@@ -219,7 +219,7 @@ static NTSTATUS smb_send_trans_request(struct dcerpc_connection *c, DATA_BLOB *b
 {
         struct smb_private *smb = c->transport.private;
         struct smb_trans2 *trans;
-        uint16 setup[2];
+        uint16_t setup[2];
        struct smb_trans_state *state;
 
        state = talloc(smb, struct smb_trans_state);

diff --git a/source4/ntvfs/common/brlock.c b/source4/ntvfs/common/brlock.c
index d521dc80d33a187e371212593007cc7a43890df8..d0385fbb0b8c9192d59dddb3f6986103b5333c2c 100644 (file)
--- a/source4/ntvfs/common/brlock.c
+++ b/source4/ntvfs/common/brlock.c
@@ -525,7 +525,7 @@ NTSTATUS brl_remove_pending(struct brl_context *brl,
 NTSTATUS brl_locktest(struct brl_context *brl,
                      DATA_BLOB *file_key, 
                      uint16_t fnum,
-                     uint16 smbpid, 
+                     uint16_t smbpid, 
                      uint64_t start, uint64_t size, 
                      enum brl_type lock_type)
 {

diff --git a/source4/ntvfs/posix/pvfs_fileinfo.c b/source4/ntvfs/posix/pvfs_fileinfo.c
index fc60aa6e89c5c4758657816665c2546dd2cb3082..027118e7d9dfca13a0edff25f122d281876c306d 100644 (file)
--- a/source4/ntvfs/posix/pvfs_fileinfo.c
+++ b/source4/ntvfs/posix/pvfs_fileinfo.c
@@ -97,7 +97,7 @@ NTSTATUS pvfs_fill_dos_info(struct pvfs_state *pvfs, struct pvfs_filename *name,
 /*
   return a set of unix file permissions for a new file or directory
 */
-mode_t pvfs_fileperms(struct pvfs_state *pvfs, uint32 attrib)
+mode_t pvfs_fileperms(struct pvfs_state *pvfs, uint32_t attrib)
 {
        mode_t mode = S_IRUSR;
 

diff --git a/source4/torture/rpc/testjoin.c b/source4/torture/rpc/testjoin.c
index 626bb666c17b98500310215726e01406ccd191c9..866863217983b9f67346113d7226b2c8b2ad02aa 100644 (file)
--- a/source4/torture/rpc/testjoin.c
+++ b/source4/torture/rpc/testjoin.c
@@ -87,7 +87,7 @@ static NTSTATUS DeleteUser_byname(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
 */
 struct test_join *torture_join_domain(const char *machine_name, 
                                      const char *domain,
-                                     uint16 acct_flags,
+                                     uint16_t acct_flags,
                                      const char **machine_password)
 {
        NTSTATUS status;