[SCM] Samba Shared Repository - branch master updated

[Simo Sorce]

The branch, master has been updated
       via  4b637c3 ldb: use of NULL pointer bugfix
      from  bdb818d s4-rpc: dnsserver: Ignore duplicate dns zones from multiple locations

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


- Log -----------------------------------------------------------------
commit 4b637c367fdda832e95208f49e8893b0a0cac4b4
Author: Pavel Reichl <pavel.reichl at redhat.com>
Date:   Tue Dec 3 14:37:20 2013 +0000

    ldb: use of NULL pointer bugfix
    
    Autobuild-User(master): Simo Sorce <idra at samba.org>
    Autobuild-Date(master): Tue Dec  3 21:13:53 CET 2013 on sn-devel-104

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

Summary of changes:
 lib/ldb/common/ldb.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/lib/ldb/common/ldb.c b/lib/ldb/common/ldb.c
index 3dc6d87..d2b873f 100644
--- a/lib/ldb/common/ldb.c
+++ b/lib/ldb/common/ldb.c
@@ -572,8 +572,8 @@ int ldb_wait(struct ldb_handle *handle, enum ldb_wait_type type)
 	struct tevent_context *ev;
 	int ret;
 
-	if (!handle) {
-		return ldb_error(handle->ldb, LDB_ERR_UNAVAILABLE, NULL);
+	if (handle == NULL) {
+		return LDB_ERR_UNAVAILABLE;
 	}
 
 	if (handle->state == LDB_ASYNC_DONE) {


-- 
Samba Shared Repository