[SCM] Samba Shared Repository - branch master updated

[Stefan Metzmacher]

The branch, master has been updated
       via  4faad28 s3:libsmb: remove unused cli_*encryption* functions
       via  28e3d09 s3:libsmb: s/cli_encryption_on/cli_state_encryption_on()
      from  bd5445e waf: restore libsmbclient handling.

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 4faad287783f9a7b22f3ff1d40c609e603a66709
Author: Stefan Metzmacher <metze at samba.org>
Date:   Thu Sep 15 16:05:45 2011 +0200

    s3:libsmb: remove unused cli_*encryption* functions
    
    metze
    
    Autobuild-User: Stefan Metzmacher <metze at samba.org>
    Autobuild-Date: Thu Sep 15 17:52:00 CEST 2011 on sn-devel-104

commit 28e3d099165ba64eb0987d74dd87816ad6207a6a
Author: Stefan Metzmacher <metze at samba.org>
Date:   Thu Sep 15 16:15:18 2011 +0200

    s3:libsmb: s/cli_encryption_on/cli_state_encryption_on()
    
    metze

-----------------------------------------------------------------------

Summary of changes:
 source3/libsmb/async_smb.c    |    4 +-
 source3/libsmb/clireadwrite.c |    4 +-
 source3/libsmb/proto.h        |    3 --
 source3/libsmb/smb_seal.c     |   45 -----------------------------------------
 4 files changed, 4 insertions(+), 52 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/libsmb/async_smb.c b/source3/libsmb/async_smb.c
index cb4e630..8966794 100644
--- a/source3/libsmb/async_smb.c
+++ b/source3/libsmb/async_smb.c
@@ -500,7 +500,7 @@ static NTSTATUS cli_smb_req_iov_send(struct tevent_req *req,
 		return status;
 	}
 
-	if (cli_encryption_on(state->cli)) {
+	if (cli_state_encryption_on(state->cli)) {
 		char *buf, *enc_buf;
 
 		buf = (char *)iov_concat(talloc_tos(), iov, iov_count);
@@ -674,7 +674,7 @@ static NTSTATUS cli_state_dispatch_smb1(struct cli_state *cli,
 		return NT_STATUS_INVALID_NETWORK_RESPONSE;
 	}
 
-	if (cli_encryption_on(cli) && (CVAL(inbuf, 0) == 0)) {
+	if (cli_state_encryption_on(cli) && (CVAL(inbuf, 0) == 0)) {
 		uint16_t enc_ctx_num;
 
 		status = get_enc_ctx_num(inbuf, &enc_ctx_num);
diff --git a/source3/libsmb/clireadwrite.c b/source3/libsmb/clireadwrite.c
index bbe6a81..1ee2196 100644
--- a/source3/libsmb/clireadwrite.c
+++ b/source3/libsmb/clireadwrite.c
@@ -47,7 +47,7 @@ static size_t cli_read_max_bufsize(struct cli_state *cli)
 			return min_space;
 		}
 
-		if (cli_encryption_on(cli)) {
+		if (cli_state_encryption_on(cli)) {
 			return min_space;
 		}
 
@@ -100,7 +100,7 @@ static size_t cli_write_max_bufsize(struct cli_state *cli,
 		return min_space;
 	}
 
-	if (cli_encryption_on(cli)) {
+	if (cli_state_encryption_on(cli)) {
 		return min_space;
 	}
 
diff --git a/source3/libsmb/proto.h b/source3/libsmb/proto.h
index 469246e..e0c8a67 100644
--- a/source3/libsmb/proto.h
+++ b/source3/libsmb/proto.h
@@ -859,9 +859,6 @@ NTSTATUS common_encrypt_buffer(struct smb_trans_enc_state *es, char *buffer, cha
 NTSTATUS common_decrypt_buffer(struct smb_trans_enc_state *es, char *buf);
 void common_free_encryption_state(struct smb_trans_enc_state **pp_es);
 void common_free_enc_buffer(struct smb_trans_enc_state *es, char *buf);
-bool cli_encryption_on(struct cli_state *cli);
-void cli_free_encryption_context(struct cli_state *cli);
-void cli_free_enc_buffer(struct cli_state *cli, char *buf);
 
 /* The following definitions come from libsmb/clisigning.c  */
 
diff --git a/source3/libsmb/smb_seal.c b/source3/libsmb/smb_seal.c
index fd9de1d..65ccdbb 100644
--- a/source3/libsmb/smb_seal.c
+++ b/source3/libsmb/smb_seal.c
@@ -422,48 +422,3 @@ void common_free_enc_buffer(struct smb_trans_enc_state *es, char *buf)
 	}
 #endif
 }
-
-/******************************************************************************
- Client side encryption.
-******************************************************************************/
-
-/******************************************************************************
- Is client encryption on ?
-******************************************************************************/
-
-bool cli_encryption_on(struct cli_state *cli)
-{
-	/* If we supported multiple encrytion contexts
-	 * here we'd look up based on tid.
-	 */
-	return common_encryption_on(cli->trans_enc_state);
-}
-
-/******************************************************************************
- Shutdown a client encryption state.
-******************************************************************************/
-
-void cli_free_encryption_context(struct cli_state *cli)
-{
-	common_free_encryption_state(&cli->trans_enc_state);
-}
-
-/******************************************************************************
- Free an encryption-allocated buffer.
-******************************************************************************/
-
-void cli_free_enc_buffer(struct cli_state *cli, char *buf)
-{
-	/* We know this is an smb buffer, and we
-	 * didn't malloc, only copy, for a keepalive,
-	 * so ignore non-session messages. */
-
-	if(CVAL(buf,0)) {
-		return;
-	}
-
-	/* If we supported multiple encrytion contexts
-	 * here we'd look up based on tid.
-	 */
-	common_free_enc_buffer(cli->trans_enc_state, buf);
-}


-- 
Samba Shared Repository