r19309: Split out checks for LDB_SUCCESS from checks for the expected number

of returned entries.

Andrew Bartlett
(This used to be commit 84efd9ecd994b53817dde8c1ad995afb7ebc8192)

diff --git a/source4/libnet/libnet_join.c b/source4/libnet/libnet_join.c
index 8112d043f60613131ae9095b6695cbca831f0121..96d9e7f0dedff29bb89af20aa1b834766d038739 100644 (file)
--- a/source4/libnet/libnet_join.c
+++ b/source4/libnet/libnet_join.c
@@ -246,15 +246,23 @@ static NTSTATUS libnet_JoinADSDomain(struct libnet_context *ctx, struct libnet_J
 
        /* search for the user's record */
        ret = ldb_search(remote_ldb, account_dn, LDB_SCOPE_BASE, 
-                            NULL, attrs, &res);
-       talloc_steal(tmp_ctx, res);
-       if (ret != LDB_SUCCESS || res->count != 1) {
+                        NULL, attrs, &res);
+       if (ret != LDB_SUCCESS) {
                r->out.error_string = talloc_asprintf(r, "ldb_search for %s failed - %s",
                                                      account_dn_str, ldb_errstring(remote_ldb));
                talloc_free(tmp_ctx);
                return NT_STATUS_UNSUCCESSFUL;
        }
 
+       talloc_steal(tmp_ctx, res);
+
+       if (res->count != 1) {
+               r->out.error_string = talloc_asprintf(r, "ldb_search for %s failed - found %d entries",
+                                                     account_dn_str, res->count);
+               talloc_free(tmp_ctx);
+               return NT_STATUS_UNSUCCESSFUL;
+       }
+
        /* If we have a kvno recorded in AD, we need it locally as well */
        kvno = ldb_msg_find_attr_as_uint(res->msgs[0], "msDS-KeyVersionNumber", 0);