[SCM] Samba Shared Repository - branch master updated

[Volker Lendecke]

The branch, master has been updated
       via  9b88166 lsa4: Fix a set but unused variable warning
      from  0ee8650 ldb: Ensure not to segfault on a filter such as (mail=)

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


- Log -----------------------------------------------------------------
commit 9b88166f4554a099fa1039ecd65b1eb7334a5715
Author: Simo Sorce <idra at samba.org>
Date:   Sun Jun 23 11:52:18 2013 -0400

    lsa4: Fix a set but unused variable warning
    
    Also insure that we exit immediately on any error.
    
    Signed-off-by: Volker Lendecke <vl at samba.org>
    Signed-off-by: Simo Sorce <idra at samba.org>
    
    Autobuild-User(master): Volker Lendecke <vl at samba.org>
    Autobuild-Date(master): Mon Jun 24 12:17:52 CEST 2013 on sn-devel-104

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

Summary of changes:
 source4/rpc_server/lsa/dcesrv_lsa.c |   14 ++++++++++++--
 1 files changed, 12 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/rpc_server/lsa/dcesrv_lsa.c b/source4/rpc_server/lsa/dcesrv_lsa.c
index 02ff0da..b5f3768 100644
--- a/source4/rpc_server/lsa/dcesrv_lsa.c
+++ b/source4/rpc_server/lsa/dcesrv_lsa.c
@@ -4114,7 +4114,7 @@ static NTSTATUS check_ft_info(TALLOC_CTX *mem_ctx,
 	const char *tname;
 	size_t dns_len;
 	size_t tlen;
-	NTSTATUS nt_status;
+	NTSTATUS nt_status = NT_STATUS_OK;
 	uint32_t new_fti_idx;
 	uint32_t i;
 	/* use always TDO type, until we understand when Xref can be used */
@@ -4219,22 +4219,32 @@ static NTSTATUS check_ft_info(TALLOC_CTX *mem_ctx,
 						  collision_type,
 						  LSA_TLN_DISABLED_CONFLICT,
 						  tdo_name);
+			if (!NT_STATUS_IS_OK(nt_status)) {
+				goto done;
+			}
 		}
 		if (sid_conflict) {
 			nt_status = add_collision(c_info, new_fti_idx,
 						  collision_type,
 						  LSA_SID_DISABLED_CONFLICT,
 						  tdo_name);
+			if (!NT_STATUS_IS_OK(nt_status)) {
+				goto done;
+			}
 		}
 		if (nb_conflict) {
 			nt_status = add_collision(c_info, new_fti_idx,
 						  collision_type,
 						  LSA_NB_DISABLED_CONFLICT,
 						  tdo_name);
+			if (!NT_STATUS_IS_OK(nt_status)) {
+				goto done;
+			}
 		}
 	}
 
-	return NT_STATUS_OK;
+done:
+	return nt_status;
 }
 
 static NTSTATUS add_collision(struct lsa_ForestTrustCollisionInfo *c_info,


-- 
Samba Shared Repository