Author: jra Date: 2007-03-21 18:33:13 +0000 (Wed, 21 Mar 2007) New Revision: 21916
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=21916 Log: Fix couple of "return" calls on void functions. Ensure we ignore reqests to free keepalive buffers as we only copied these. Jeremy. Modified: branches/SAMBA_3_0/source/libsmb/smb_seal.c Changeset: Modified: branches/SAMBA_3_0/source/libsmb/smb_seal.c =================================================================== --- branches/SAMBA_3_0/source/libsmb/smb_seal.c 2007-03-21 17:59:29 UTC (rev 21915) +++ branches/SAMBA_3_0/source/libsmb/smb_seal.c 2007-03-21 18:33:13 UTC (rev 21916) @@ -238,6 +238,14 @@ return; } + /* We know this is an smb buffer, and we + * didn't malloc, only copy, for a keepalive, + * so ignore session keepalives. */ + + if(CVAL(buf,0) == SMBkeepalive) { + return; + } + if (es->smb_enc_type == SMB_TRANS_ENC_NTLM) { SAFE_FREE(buf); return; @@ -267,7 +275,7 @@ void cli_free_encryption_context(struct cli_state *cli) { - return common_free_encryption_state(&cli->trans_enc_state); + common_free_encryption_state(&cli->trans_enc_state); } /****************************************************************************** @@ -276,7 +284,7 @@ void cli_free_enc_buffer(struct cli_state *cli, char *buf) { - return common_free_enc_buffer(cli->trans_enc_state, buf); + common_free_enc_buffer(cli->trans_enc_state, buf); } /******************************************************************************
