s4:"ldb_connect" calls - proof for "!= LDB_SUCCESS"

Reviewed-by: abartlet

diff --git a/source4/dns_server/dlz_bind9.c b/source4/dns_server/dlz_bind9.c
index 4399e1cd1f978d6b4c2398384bce7d291e02a5c3..4873112a11ec7615f22a946c1456aef7722b1a99 100644 (file)
--- a/source4/dns_server/dlz_bind9.c
+++ b/source4/dns_server/dlz_bind9.c
@@ -533,7 +533,7 @@ _PUBLIC_ isc_result_t dlz_create(const char *dlzname,
        }
 
        ret = ldb_connect(state->samdb, options.url, 0, NULL);
-       if (ret == -1) {
+       if (ret != LDB_SUCCESS) {
                state->log(ISC_LOG_ERROR, "samba_dlz: Failed to connect to %s - %s",
                           options.url, ldb_errstring(state->samdb));
                result = ISC_R_FAILURE;

diff --git a/source4/dsdb/samdb/ldb_modules/proxy.c b/source4/dsdb/samdb/ldb_modules/proxy.c
index 6fba24fc2d94bcf42591b180cc6c99c7a6c97c1f..5f6e56f9d47608f5a6505bb2816a03535b164a8d 100644 (file)
--- a/source4/dsdb/samdb/ldb_modules/proxy.c
+++ b/source4/dsdb/samdb/ldb_modules/proxy.c
@@ -138,7 +138,7 @@ static int load_proxy_info(struct ldb_module *module)
        ldb_set_opaque(proxy->upstream, "credentials", creds);
 
        ret = ldb_connect(proxy->upstream, url, 0, NULL);
-       if (ret != 0) {
+       if (ret != LDB_SUCCESS) {
                ldb_debug(ldb, LDB_DEBUG_FATAL, "proxy failed to connect to %s\n", url);
                goto failed;
        }

diff --git a/source4/torture/rpc/testjoin.c b/source4/torture/rpc/testjoin.c
index 776ddbab7247c1d766e1042e8528c57223cd0870..76344e0ddf06f18c1b62cfacd2add2893b3dc489 100644 (file)
--- a/source4/torture/rpc/testjoin.c
+++ b/source4/torture/rpc/testjoin.c
@@ -583,7 +583,7 @@ static NTSTATUS torture_leave_ads_domain(struct torture_context *torture,
        ldb_set_opaque(ldb_ctx, "loadparm", cmdline_lp_ctx);
 
        rtn = ldb_connect(ldb_ctx, remote_ldb_url, 0, NULL);
-       if (rtn != 0) {
+       if (rtn != LDB_SUCCESS) {
                libnet_r->out.error_string = NULL;
                talloc_free(tmp_ctx);
                return NT_STATUS_UNSUCCESSFUL;