[SCM] Samba Shared Repository - branch master updated

[Jeremy Allison]

The branch, master has been updated
       via  dd8a085 CID 1311772: Fix null pointer check
       via  2bfe12e CID 1311771: Fix a null pointer dereference
       via  2f86e32 CID 1311767: Cast enum type to avoid compiler warnings
       via  0c01771 CID 1311764: Fix logical compare in if clause
       via  7680cf8 CID 1311763: Fix incorrect return value
      from  7ce0b7c9 s4-torture: add test for ClusterControl to clusapi testsuite.

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


- Log -----------------------------------------------------------------
commit dd8a085b0115e300c29da480e066d47146dde86a
Author: Andreas Schneider <asn at samba.org>
Date:   Tue Jul 14 11:46:22 2015 +0200

    CID 1311772: Fix null pointer check
    
    Signed-off-by: Andreas Schneider <asn at samba.org>
    Reviewed-by: Jeremy Allison <jra at samba.org>
    
    Autobuild-User(master): Jeremy Allison <jra at samba.org>
    Autobuild-Date(master): Wed Jul 15 04:50:36 CEST 2015 on sn-devel-104

commit 2bfe12e96eaca46905c7e6c049952aa66b68eddf
Author: Andreas Schneider <asn at samba.org>
Date:   Tue Jul 14 11:44:58 2015 +0200

    CID 1311771: Fix a null pointer dereference
    
    We check for dir == NULL but dereference it during variable declaration.
    
    Signed-off-by: Andreas Schneider <asn at samba.org>
    Reviewed-by: Jeremy Allison <jra at samba.org>

commit 2f86e32a993727f61d61f9a254dafff9efdb769f
Author: Andreas Schneider <asn at samba.org>
Date:   Tue Jul 14 11:40:31 2015 +0200

    CID 1311767: Cast enum type to avoid compiler warnings
    
    Signed-off-by: Andreas Schneider <asn at samba.org>
    Reviewed-by: Jeremy Allison <jra at samba.org>

commit 0c01771e3b971b1dc35c930a0a77e0a595fdd9a1
Author: Andreas Schneider <asn at samba.org>
Date:   Tue Jul 14 11:34:45 2015 +0200

    CID 1311764: Fix logical compare in if clause
    
    Signed-off-by: Andreas Schneider <asn at samba.org>
    Reviewed-by: Jeremy Allison <jra at samba.org>

commit 7680cf881a7d44e27be46a87d4e7bbf539cf7d77
Author: Andreas Schneider <asn at samba.org>
Date:   Tue Jul 14 11:33:35 2015 +0200

    CID 1311763: Fix incorrect return value
    
    Signed-off-by: Andreas Schneider <asn at samba.org>
    Reviewed-by: Jeremy Allison <jra at samba.org>

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

Summary of changes:
 source3/libsmb/libsmb_dir.c          |  3 ++-
 source3/winbindd/winbindd_dual_srv.c |  2 +-
 source4/dsdb/common/util_trusts.c    | 10 +++++-----
 3 files changed, 8 insertions(+), 7 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/libsmb/libsmb_dir.c b/source3/libsmb/libsmb_dir.c
index f332525..636e0cc 100644
--- a/source3/libsmb/libsmb_dir.c
+++ b/source3/libsmb/libsmb_dir.c
@@ -2227,7 +2227,7 @@ SMBC_notify_ctx(SMBCCTX *context, SMBCFILE *dir, smbc_bool recursive,
 		smbc_notify_callback_fn cb, void *private_data)
 {
 	TALLOC_CTX *frame = talloc_stackframe();
-	struct cli_state *cli = dir->srv->cli;
+	struct cli_state *cli;
 	char *server = NULL;
 	char *share = NULL;
 	char *user = NULL;
@@ -2275,6 +2275,7 @@ SMBC_notify_ctx(SMBCCTX *context, SMBCFILE *dir, smbc_bool recursive,
 	DEBUG(4, ("%s(%p, %d, %"PRIu32")\n", __func__, dir,
 		  (int)recursive, completion_filter));
 
+	cli = dir->srv->cli;
 	status = cli_ntcreate(
 		cli, path, 0, FILE_READ_DATA, 0,
 		FILE_SHARE_READ|FILE_SHARE_WRITE|FILE_SHARE_DELETE,
diff --git a/source3/winbindd/winbindd_dual_srv.c b/source3/winbindd/winbindd_dual_srv.c
index 0f4b407..1fe66e1 100644
--- a/source3/winbindd/winbindd_dual_srv.c
+++ b/source3/winbindd/winbindd_dual_srv.c
@@ -1226,7 +1226,7 @@ reconnect:
 			DEBUG(0,("%s:%s: local_lsa.lsaRSetForestTrustInformation(%s) returned %s\n",
 				 __location__, __func__, domain->name, nt_errstr(result)));
 			TALLOC_FREE(frame);
-			return ntstatus_to_werror(status);
+			return ntstatus_to_werror(result);
 		}
 	}
 
diff --git a/source4/dsdb/common/util_trusts.c b/source4/dsdb/common/util_trusts.c
index 0e41803..73221eb 100644
--- a/source4/dsdb/common/util_trusts.c
+++ b/source4/dsdb/common/util_trusts.c
@@ -73,7 +73,7 @@ NTSTATUS dsdb_trust_forest_info_from_lsa(TALLOC_CTX *mem_ctx,
 
 		ftr->flags = lftr->flags;
 		ftr->timestamp = lftr->time;
-		ftr->type = lftr->type;
+		ftr->type = (enum ForestTrustInfoRecordType)lftr->type;
 
 		switch (lftr->type) {
 		case LSA_FOREST_TRUST_TOP_LEVEL_NAME:
@@ -156,7 +156,7 @@ static NTSTATUS dsdb_trust_forest_record_to_lsa(TALLOC_CTX *mem_ctx,
 
 	lftr->flags = ftr->flags;
 	lftr->time = ftr->timestamp;
-	lftr->type = ftr->type;
+	lftr->type = (enum lsa_ForestTrustRecordType)ftr->type;
 
 	switch (lftr->type) {
 	case LSA_FOREST_TRUST_TOP_LEVEL_NAME:
@@ -233,7 +233,7 @@ NTSTATUS dsdb_trust_forest_info_to_lsa(TALLOC_CTX *mem_ctx,
 	}
 
 	lfti = talloc_zero(mem_ctx, struct lsa_ForestTrustInformation);
-	if (fti == NULL) {
+	if (lfti == NULL) {
 		return NT_STATUS_NO_MEMORY;
 	}
 
@@ -657,7 +657,7 @@ static int dns_cmp(const char *s1, const char *s2)
 		if (i == 0) {
 			p1 = s1;
 
-			if (l1 == 0 && l1 >= UINT16_MAX) {
+			if (l1 == 0 || l1 >= UINT16_MAX) {
 				/* just use one single component on overflow */
 				break;
 			}
@@ -687,7 +687,7 @@ static int dns_cmp(const char *s1, const char *s2)
 		if (i == 0) {
 			p2 = s2;
 
-			if (l2 == 0 && l2 >= UINT16_MAX) {
+			if (l2 == 0 || l2 >= UINT16_MAX) {
 				/* just use one single component on overflow */
 				break;
 			}


-- 
Samba Shared Repository