From c929c213c91b2f9d55f96d6964b9390636178991 Mon Sep 17 00:00:00 2001
From: Simo Sorce <simo@redhat.com>
Date: Thu, 19 Jul 2012 18:17:10 -0400
Subject: Fix wrong elements used in comparison

---
 src/db/sysdb_subdomains.c          | 4 ++--
 src/providers/ipa/ipa_subdomains.c | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/db/sysdb_subdomains.c b/src/db/sysdb_subdomains.c
index 671c56558..46e034977 100644
--- a/src/db/sysdb_subdomains.c
+++ b/src/db/sysdb_subdomains.c
@@ -240,8 +240,8 @@ errno_t sysdb_master_domain_add_info(struct sysdb_ctx *sysdb,
     }
 
     if (domain_info->id != NULL &&
-        (current_info->flat_name == NULL ||
-         strcmp(current_info->flat_name, domain_info->id) != 0) ) {
+        (current_info->id == NULL ||
+         strcmp(current_info->id, domain_info->id) != 0) ) {
         ret = ldb_msg_add_empty(msg, SYSDB_SUBDOMAIN_ID, LDB_FLAG_MOD_REPLACE,
                                 NULL);
         if (ret != LDB_SUCCESS) {
diff --git a/src/providers/ipa/ipa_subdomains.c b/src/providers/ipa/ipa_subdomains.c
index c4ed51ac5..10b41d946 100644
--- a/src/providers/ipa/ipa_subdomains.c
+++ b/src/providers/ipa/ipa_subdomains.c
@@ -562,7 +562,7 @@ static void ipa_subdomains_handler_master_done(struct tevent_req *req)
             goto done;
         }
         domain_info->id = talloc_strdup(domain_info, tmp_str);
-        if (domain_info->flat_name == NULL) {
+        if (domain_info->id == NULL) {
             ret = ENOMEM;
             goto done;
         }
-- 
cgit