2 files changed, 4 insertions, 10 deletions
diff --git a/src/confdb/confdb.c b/src/confdb/confdb.c
index 14e9f057..31efd944 100644
--- a/src/confdb/confdb.c
+++ b/src/confdb/confdb.c
@@ -1122,7 +1122,7 @@ int confdb_get_domains(struct confdb_ctx *cdb,
                        struct sss_domain_info **domains)
 {
     TALLOC_CTX *tmp_ctx;
-    struct sss_domain_info *domain, *prevdom = NULL;
+    struct sss_domain_info *domain = NULL;
     char **domlist;
     int ret, i;
 
@@ -1155,13 +1155,7 @@ int confdb_get_domains(struct confdb_ctx *cdb,
             continue;
         }
 
-        if (cdb->doms == NULL) {
-            cdb->doms = domain;
-            prevdom = cdb->doms;
-        } else {
-            prevdom->next = domain;
-            prevdom = domain;
-        }
+        DLIST_ADD_END(cdb->doms, domain, struct sss_domain_info *);
     }
 
     if (cdb->doms == NULL) {
diff --git a/src/confdb/confdb.h b/src/confdb/confdb.h
index 71c30367..c1b92534 100644
--- a/src/confdb/confdb.h
+++ b/src/confdb/confdb.h
@@ -229,14 +229,14 @@ struct sss_domain_info {
     struct sysdb_ctx *sysdb;
     struct sss_names_ctx *names;
 
-    struct sss_domain_info **subdomains;
-    uint32_t subdomain_count;
     struct sss_domain_info *parent;
+    struct sss_domain_info *subdomains;
     char *realm;
     char *flat_name;
     char *domain_id;
     struct timeval subdomains_last_checked;
 
+    struct sss_domain_info *prev;
     struct sss_domain_info *next;
 
     bool disabled;