summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2011-10-19 15:35:23 +0200
committerStefan Metzmacher <metze@samba.org>2011-10-19 17:32:23 +0200
commit0e0e44a626538c6af8b06bcd9ca55b625d0ed540 (patch)
treeb56c02cdda53e6db63bc01f55028fabfb66c9726
parent1b9c8d4867aed7aa19fecba563957a0d99280ce9 (diff)
downloadsamba-0e0e44a626538c6af8b06bcd9ca55b625d0ed540.tar.gz
samba-0e0e44a626538c6af8b06bcd9ca55b625d0ed540.tar.bz2
samba-0e0e44a626538c6af8b06bcd9ca55b625d0ed540.zip
s3:libsmb/smb_seal: s/uint16/uint16_t
metze
-rw-r--r--source3/include/smb_crypt.h4
-rw-r--r--source3/libsmb/smb_seal.c6
2 files changed, 5 insertions, 5 deletions
diff --git a/source3/include/smb_crypt.h b/source3/include/smb_crypt.h
index ed0063e2e2..e4070b56a6 100644
--- a/source3/include/smb_crypt.h
+++ b/source3/include/smb_crypt.h
@@ -49,7 +49,7 @@ struct smb_tran_enc_state_gss {
struct smb_trans_enc_state {
enum smb_trans_enc_type smb_enc_type;
- uint16 enc_ctx_num;
+ uint16_t enc_ctx_num;
bool enc_on;
union {
struct auth_ntlmssp_state *auth_ntlmssp_state;
@@ -61,7 +61,7 @@ struct smb_trans_enc_state {
/* The following definitions come from libsmb/smb_seal.c */
-NTSTATUS get_enc_ctx_num(const uint8_t *buf, uint16 *p_enc_ctx_num);
+NTSTATUS get_enc_ctx_num(const uint8_t *buf, uint16_t *p_enc_ctx_num);
bool common_encryption_on(struct smb_trans_enc_state *es);
NTSTATUS common_encrypt_buffer(struct smb_trans_enc_state *es, char *buffer, char **buf_out);
NTSTATUS common_decrypt_buffer(struct smb_trans_enc_state *es, char *buf);
diff --git a/source3/libsmb/smb_seal.c b/source3/libsmb/smb_seal.c
index c5541107ab..e50215b36e 100644
--- a/source3/libsmb/smb_seal.c
+++ b/source3/libsmb/smb_seal.c
@@ -28,7 +28,7 @@
Pull out the encryption context for this packet. 0 means global context.
******************************************************************************/
-NTSTATUS get_enc_ctx_num(const uint8_t *buf, uint16 *p_enc_ctx_num)
+NTSTATUS get_enc_ctx_num(const uint8_t *buf, uint16_t *p_enc_ctx_num)
{
if (smb_len(buf) < 8) {
return NT_STATUS_INVALID_BUFFER_SIZE;
@@ -113,7 +113,7 @@ static NTSTATUS common_ntlm_decrypt_buffer(struct auth_ntlmssp_state *auth_ntlms
******************************************************************************/
static NTSTATUS common_ntlm_encrypt_buffer(struct auth_ntlmssp_state *auth_ntlmssp_state,
- uint16 enc_ctx_num,
+ uint16_t enc_ctx_num,
char *buf,
char **ppbuf_out)
{
@@ -224,7 +224,7 @@ static NTSTATUS common_gss_decrypt_buffer(struct smb_tran_enc_state_gss *gss_sta
******************************************************************************/
static NTSTATUS common_gss_encrypt_buffer(struct smb_tran_enc_state_gss *gss_state,
- uint16 enc_ctx_num,
+ uint16_t enc_ctx_num,
char *buf,
char **ppbuf_out)
{