[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-1212-g1563796

[Stefan Metzmacher]

The branch, master has been updated
       via  1563796b44f43be33fecf9907c967d0fdd14f0ff (commit)
       via  488bac4038e12a952fa912b64624facf17d6eff0 (commit)
       via  42e3ae655091d48e5a921969849c6173a498c963 (commit)
       via  c78a4ac7ced4abdc0bd090f13cde927356097b0e (commit)
      from  f4195183a47b0e7c8bc9644d62b123f7880f3fcd (commit)

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


- Log -----------------------------------------------------------------
commit 1563796b44f43be33fecf9907c967d0fdd14f0ff
Author: Björn Jacke <bj at sernet.de>
Date:   Fri Apr 3 19:27:16 2009 +0200

    s4:ldb: fix extrasemi compile warning

commit 488bac4038e12a952fa912b64624facf17d6eff0
Author: Björn Jacke <bj at sernet.de>
Date:   Mon Mar 30 13:18:34 2009 +0200

    s4:ldb: do talloc_free and return NULL when we have no matches to return

commit 42e3ae655091d48e5a921969849c6173a498c963
Author: Björn Jacke <bj at sernet.de>
Date:   Mon Mar 30 13:47:58 2009 +0200

    libcli: fix a "not handled in switch" compile warning
    
    return NULL also for RAW_CLOSE_GENERIC

commit c78a4ac7ced4abdc0bd090f13cde927356097b0e
Author: Björn Jacke <bj at sernet.de>
Date:   Mon Mar 30 13:39:42 2009 +0200

    Ñ•4: fix a "not handled in switch" compile warning

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

Summary of changes:
 source4/dsdb/samdb/ldb_modules/anr.c       |    4 ++++
 source4/dsdb/samdb/ldb_modules/partition.c |    2 +-
 source4/libcli/raw/rawfile.c               |    1 +
 source4/libcli/smb_composite/connect.c     |    2 ++
 4 files changed, 8 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/dsdb/samdb/ldb_modules/anr.c b/source4/dsdb/samdb/ldb_modules/anr.c
index a04f5eb..deeccac 100644
--- a/source4/dsdb/samdb/ldb_modules/anr.c
+++ b/source4/dsdb/samdb/ldb_modules/anr.c
@@ -89,6 +89,7 @@ static struct ldb_parse_tree *make_match_tree(struct ldb_module *module,
 		match_tree->u.substring.chunks = talloc_array(match_tree, struct ldb_val *, 2);
 		
 		if (match_tree->u.substring.chunks == NULL){
+			talloc_free(match_tree);
 			ldb_oom(ldb);
 			return NULL;
 		}
@@ -99,6 +100,9 @@ static struct ldb_parse_tree *make_match_tree(struct ldb_module *module,
 		match_tree->u.equality.attr = attr;
 		match_tree->u.equality.value = *match;
 		break;
+	default:
+		talloc_free(match_tree);
+		return NULL;
 	}
 	return match_tree;
 }
diff --git a/source4/dsdb/samdb/ldb_modules/partition.c b/source4/dsdb/samdb/ldb_modules/partition.c
index 3231f7a..663ff07 100644
--- a/source4/dsdb/samdb/ldb_modules/partition.c
+++ b/source4/dsdb/samdb/ldb_modules/partition.c
@@ -151,7 +151,7 @@ static struct dsdb_control_current_partition *find_partition(struct partition_pr
 	}
 
 	return NULL;
-};
+}
 
 /**
  * fire the caller's callback for every entry, but only send 'done' once.
diff --git a/source4/libcli/raw/rawfile.c b/source4/libcli/raw/rawfile.c
index 63de051..6fac7b8 100644
--- a/source4/libcli/raw/rawfile.c
+++ b/source4/libcli/raw/rawfile.c
@@ -796,6 +796,7 @@ _PUBLIC_ struct smbcli_request *smb_raw_close_send(struct smbcli_tree *tree, uni
 		break;
 
 	case RAW_CLOSE_SMB2:
+	case RAW_CLOSE_GENERIC:
 		return NULL;
 	}
 
diff --git a/source4/libcli/smb_composite/connect.c b/source4/libcli/smb_composite/connect.c
index 3db777d..a5d05b7 100644
--- a/source4/libcli/smb_composite/connect.c
+++ b/source4/libcli/smb_composite/connect.c
@@ -418,6 +418,8 @@ static void state_handler(struct composite_context *c)
 	case CONNECT_TCON:
 		c->status = connect_tcon(c, state->io);
 		break;
+	case CONNECT_DONE:
+		break;
 	}
 
 	if (state->stage == CONNECT_DONE) {


-- 
Samba Shared Repository