[SCM] Samba Shared Repository - branch master updated

Volker Lendecke vlendec at samba.org
Fri Aug 5 10:30:02 MDT 2011


The branch, master has been updated
       via  dfa8a5f s3: Make srv_enc_ctx static
       via  3b5e7c5 s3: Fix a debug message
       via  eb2d396 s3: Fix some nonempty blank lines
      from  c73890d s3: Fix "ISO C90 forbids mixed declarations and code"

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


- Log -----------------------------------------------------------------
commit dfa8a5fca5bff05f37d18e56e049e2d176fb140c
Author: Volker Lendecke <vl at samba.org>
Date:   Fri Aug 5 16:19:27 2011 +0200

    s3: Make srv_enc_ctx static
    
    Autobuild-User: Volker Lendecke <vlendec at samba.org>
    Autobuild-Date: Fri Aug  5 18:29:24 CEST 2011 on sn-devel-104

commit 3b5e7c55d8b9745e793e1cabaf8730e260505ebd
Author: Volker Lendecke <vl at samba.org>
Date:   Fri Aug 5 16:14:11 2011 +0200

    s3: Fix a debug message

commit eb2d3961d800032fdcfa6391dd868f234066a2ab
Author: Volker Lendecke <vl at samba.org>
Date:   Fri Aug 5 16:01:23 2011 +0200

    s3: Fix some nonempty blank lines

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

Summary of changes:
 source3/include/vfs.h |    6 +++---
 source3/smbd/proto.h  |    1 -
 source3/smbd/reply.c  |    2 +-
 source3/smbd/seal.c   |    8 ++++----
 4 files changed, 8 insertions(+), 9 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/include/vfs.h b/source3/include/vfs.h
index 5c7e4e5..b47e80f 100644
--- a/source3/include/vfs.h
+++ b/source3/include/vfs.h
@@ -6,17 +6,17 @@
    Copyright (C) Alexander Bokovoy			2002-2005
    Copyright (C) Stefan (metze) Metzmacher		2003
    Copyright (C) Volker Lendecke			2009
-   
+
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
-   
+
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
-   
+
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
diff --git a/source3/smbd/proto.h b/source3/smbd/proto.h
index 7dee467..92a1d38 100644
--- a/source3/smbd/proto.h
+++ b/source3/smbd/proto.h
@@ -936,7 +936,6 @@ void reply_getattrE(struct smb_request *req);
 
 /* The following definitions come from smbd/seal.c  */
 
-uint16_t srv_enc_ctx(void);
 bool is_encrypted_packet(const uint8_t *inbuf);
 void srv_free_enc_buffer(char *buf);
 NTSTATUS srv_decrypt_buffer(char *buf);
diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c
index 2bc80f4..cd07c6d 100644
--- a/source3/smbd/reply.c
+++ b/source3/smbd/reply.c
@@ -482,7 +482,7 @@ static bool netbios_session_retarget(struct smbd_server_connection *sconn,
 
 	if (!srv_send_smb(sconn, (char *)outbuf, false, 0, false,
 			  NULL)) {
-		exit_server_cleanly("netbios_session_regarget: srv_send_smb "
+		exit_server_cleanly("netbios_session_retarget: srv_send_smb "
 				    "failed.");
 	}
 
diff --git a/source3/smbd/seal.c b/source3/smbd/seal.c
index 979c97c..fa25cad 100644
--- a/source3/smbd/seal.c
+++ b/source3/smbd/seal.c
@@ -2,17 +2,17 @@
    Unix SMB/CIFS implementation.
    SMB Transport encryption (sealing) code - server code.
    Copyright (C) Jeremy Allison 2007.
-   
+
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
-   
+
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
-   
+
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
@@ -46,7 +46,7 @@ struct smb_srv_trans_enc_ctx {
  Return global enc context - this must change if we ever do multiple contexts.
 ******************************************************************************/
 
-uint16_t srv_enc_ctx(void)
+static uint16_t srv_enc_ctx(void)
 {
 	return srv_trans_enc_ctx->es->enc_ctx_num;
 }


-- 
Samba Shared Repository


More information about the samba-cvs mailing list