summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2011-10-19 17:37:29 +0200
committerStefan Metzmacher <metze@samba.org>2011-10-19 19:06:35 +0200
commitd825a2add6c6b80a7cf516d726d27ab2be2c90e8 (patch)
tree039bbdc5b2ae71da5ddceb1a5d4b792fd9aa2352
parent0e0e44a626538c6af8b06bcd9ca55b625d0ed540 (diff)
downloadsamba-d825a2add6c6b80a7cf516d726d27ab2be2c90e8.tar.gz
samba-d825a2add6c6b80a7cf516d726d27ab2be2c90e8.tar.bz2
samba-d825a2add6c6b80a7cf516d726d27ab2be2c90e8.zip
s3:libsmb/smb_seal: move smb_set_enclen() to smb_seal.c and make it static there
metze Autobuild-User: Stefan Metzmacher <metze@samba.org> Autobuild-Date: Wed Oct 19 19:06:35 CEST 2011 on sn-devel-104
-rw-r--r--source3/include/proto.h1
-rw-r--r--source3/lib/util.c13
-rw-r--r--source3/libsmb/smb_seal.c13
3 files changed, 13 insertions, 14 deletions
diff --git a/source3/include/proto.h b/source3/include/proto.h
index 0fd2281dbf..fdeabefec2 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -489,7 +489,6 @@ bool socket_exist(const char *fname);
uint64_t get_file_size_stat(const SMB_STRUCT_STAT *sbuf);
SMB_OFF_T get_file_size(char *file_name);
void show_msg(const char *buf);
-void smb_set_enclen(char *buf,int len,uint16 enc_ctx_num);
void smb_setlen(char *buf,int len);
int set_message_bcc(char *buf,int num_bytes);
ssize_t message_push_blob(uint8 **outbuf, DATA_BLOB blob);
diff --git a/source3/lib/util.c b/source3/lib/util.c
index f29568fca0..df82733bc1 100644
--- a/source3/lib/util.c
+++ b/source3/lib/util.c
@@ -184,19 +184,6 @@ void show_msg(const char *buf)
}
/*******************************************************************
- Set the length and marker of an encrypted smb packet.
-********************************************************************/
-
-void smb_set_enclen(char *buf,int len,uint16 enc_ctx_num)
-{
- _smb_setlen(buf,len);
-
- SCVAL(buf,4,0xFF);
- SCVAL(buf,5,'E');
- SSVAL(buf,6,enc_ctx_num);
-}
-
-/*******************************************************************
Set the length and marker of an smb packet.
********************************************************************/
diff --git a/source3/libsmb/smb_seal.c b/source3/libsmb/smb_seal.c
index e50215b36e..4afd617c91 100644
--- a/source3/libsmb/smb_seal.c
+++ b/source3/libsmb/smb_seal.c
@@ -47,6 +47,19 @@ NTSTATUS get_enc_ctx_num(const uint8_t *buf, uint16_t *p_enc_ctx_num)
return NT_STATUS_INVALID_NETWORK_RESPONSE;
}
+/*******************************************************************
+ Set the length and marker of an encrypted smb packet.
+********************************************************************/
+
+static void smb_set_enclen(char *buf,int len,uint16_t enc_ctx_num)
+{
+ _smb_setlen(buf,len);
+
+ SCVAL(buf,4,0xFF);
+ SCVAL(buf,5,'E');
+ SSVAL(buf,6,enc_ctx_num);
+}
+
/******************************************************************************
Generic code for client and server.
Is encryption turned on ?