[SCM] Samba Shared Repository - branch master updated

[David Disseldorp]

The branch, master has been updated
       via  2107ba5 ldb: fix compiler warning
       via  8fb9e08 s3:smb2_server: remove unused outhdr variables
      from  dfd341a samba-tool: add subcommand for sites manipulation

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


- Log -----------------------------------------------------------------
commit 2107ba5be87d6a9f7691cfcbe5411fa7174120b7
Author: David Disseldorp <ddiss at suse.de>
Date:   Wed Nov 2 14:53:20 2011 +0100

    ldb: fix compiler warning
    
    Mixed declarations and code.
    
    Autobuild-User: David Disseldorp <ddiss at samba.org>
    Autobuild-Date: Wed Nov  2 16:51:24 CET 2011 on sn-devel-104

commit 8fb9e087e3fc082cd5a8b835b8301f31204792d9
Author: David Disseldorp <ddiss at suse.de>
Date:   Wed Nov 2 14:51:51 2011 +0100

    s3:smb2_server: remove unused outhdr variables

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

Summary of changes:
 lib/ldb/common/ldb_parse.c |    2 +-
 source3/smbd/smb2_server.c |    2 --
 2 files changed, 1 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/lib/ldb/common/ldb_parse.c b/lib/ldb/common/ldb_parse.c
index 407af9f..47145a2 100644
--- a/lib/ldb/common/ldb_parse.c
+++ b/lib/ldb/common/ldb_parse.c
@@ -535,12 +535,12 @@ static struct ldb_parse_tree *ldb_parse_filterlist(TALLOC_CTX *mem_ctx, const ch
 	while (isspace((unsigned char)*p)) p++;
 
 	while (*p) {
+		struct ldb_parse_tree **e;
 		if (*p == ')') {
 			break;
 		}
 
 		next = ldb_parse_filter(ret->u.list.elements, &p);
-		struct ldb_parse_tree **e;
 		if (next == NULL) {
 			/* an invalid filter element */
 			talloc_free(ret);
diff --git a/source3/smbd/smb2_server.c b/source3/smbd/smb2_server.c
index 5b41c3b..5977e98 100644
--- a/source3/smbd/smb2_server.c
+++ b/source3/smbd/smb2_server.c
@@ -1142,7 +1142,6 @@ static NTSTATUS smbd_smb2_request_process_cancel(struct smbd_smb2_request *req)
 static NTSTATUS smbd_smb2_request_check_tcon(struct smbd_smb2_request *req)
 {
 	const uint8_t *inhdr;
-	const uint8_t *outhdr;
 	int i = req->current_idx;
 	uint32_t in_flags;
 	uint32_t in_tid;
@@ -1189,7 +1188,6 @@ static NTSTATUS smbd_smb2_request_check_tcon(struct smbd_smb2_request *req)
 static NTSTATUS smbd_smb2_request_check_session(struct smbd_smb2_request *req)
 {
 	const uint8_t *inhdr;
-	const uint8_t *outhdr;
 	int i = req->current_idx;
 	uint32_t in_flags;
 	uint64_t in_session_id;


-- 
Samba Shared Repository