diff options
Diffstat (limited to 'source4')
| -rw-r--r-- | source4/auth/auth.h | 6 | ||||
| -rw-r--r-- | source4/auth/auth_util.c | 2 | ||||
| -rw-r--r-- | source4/libcli/ldap/ldap.c | 2 | ||||
| -rw-r--r-- | source4/libcli/security/security_descriptor.c | 2 | ||||
| -rw-r--r-- | source4/librpc/rpc/dcerpc.c | 2 | ||||
| -rw-r--r-- | source4/librpc/rpc/dcerpc_schannel.c | 2 | ||||
| -rw-r--r-- | source4/librpc/rpc/dcerpc_smb.c | 2 | ||||
| -rw-r--r-- | source4/ntvfs/common/brlock.c | 2 | ||||
| -rw-r--r-- | source4/ntvfs/posix/pvfs_fileinfo.c | 2 | ||||
| -rw-r--r-- | source4/torture/rpc/testjoin.c | 2 |
10 files changed, 12 insertions, 12 deletions
diff --git a/source4/auth/auth.h b/source4/auth/auth.h index e78b21339f..425410e088 100644 --- 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 34aa632c3a..d80e5fdb78 100644 --- 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 eab94bb194..655838b64f 100644 --- 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 bbfee31fbe..77d296235a 100644 --- 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 bdf9cb2581..04a13b0100 100644 --- 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 7cd2d1654f..a6262d85f0 100644 --- 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 8d049ad967..aa2d0bf20f 100644 --- 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 d521dc80d3..d0385fbb0b 100644 --- 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 fc60aa6e89..027118e7d9 100644 --- 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 626bb666c1..8668632179 100644 --- 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; |