[SCM] Samba Shared Repository - branch master updated

Matthieu Patou mat at samba.org
Wed May 27 10:41:03 MDT 2015


The branch, master has been updated
       via  ce4830e Fix segfault in the very rare case when we are not able to find the rootnamingcontext
      from  062bc17 smbd: Fix a typo

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


- Log -----------------------------------------------------------------
commit ce4830e00a62b16adc344107e2d5dc5e85588be3
Author: Matthieu Patou <mat at matws.net>
Date:   Sat May 23 00:02:42 2015 -0700

    Fix segfault in the very rare case when we are not able to find the rootnamingcontext
    
    Signed-off-by: Matthieu Patou <mat at matws.net>
    Reviewed-by: Volker Lendecke <vl at samba.org>
    Change-Id: I96fd5c7f39280090d5ec1dcdcb445fd7a44bd1c6
    
    Autobuild-User(master): Matthieu Patou <mat at samba.org>
    Autobuild-Date(master): Wed May 27 18:40:35 CEST 2015 on sn-devel-104

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

Summary of changes:
 source4/dsdb/common/util.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


Changeset truncated at 500 lines:

diff --git a/source4/dsdb/common/util.c b/source4/dsdb/common/util.c
index 7b948f2..2b7d492 100644
--- a/source4/dsdb/common/util.c
+++ b/source4/dsdb/common/util.c
@@ -3468,7 +3468,7 @@ int dsdb_find_nc_root(struct ldb_context *samdb, TALLOC_CTX *mem_ctx, struct ldb
 
 	ret = ldb_search(samdb, tmp_ctx, &root_res,
 			 ldb_dn_new(tmp_ctx, samdb, ""), LDB_SCOPE_BASE, root_attrs, NULL);
-	if (ret != LDB_SUCCESS) {
+	if (ret != LDB_SUCCESS || root_res->count == 0) {
 		DEBUG(1,("Searching for namingContexts in rootDSE failed: %s\n", ldb_errstring(samdb)));
 		talloc_free(tmp_ctx);
 		return ret;


-- 
Samba Shared Repository


More information about the samba-cvs mailing list