From 4f118e3e6a25762f40a43e6dbefb09f44adbef32 Mon Sep 17 00:00:00 2001
From: Simo Sorce <simo@redhat.com>
Date: Tue, 15 Jan 2013 22:19:36 -0500
Subject: Introduce IS_SUBDOMAIN() macro

Fixes https://fedorahosted.org/sssd/ticket/1766
---
 src/responder/common/responder_common.c      | 6 +++---
 src/responder/common/responder_get_domains.c | 2 +-
 src/responder/nss/nsssrv_cmd.c               | 6 +++---
 src/responder/pac/pacsrv_cmd.c               | 2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'src/responder')

diff --git a/src/responder/common/responder_common.c b/src/responder/common/responder_common.c
index 877181f8..c7aead3e 100644
--- a/src/responder/common/responder_common.c
+++ b/src/responder/common/responder_common.c
@@ -894,15 +894,15 @@ responder_get_domain(TALLOC_CTX *sd_mem_ctx, struct resp_ctx *rctx,
     struct sss_domain_info *ret_dom = NULL;
 
     for (dom = rctx->domains; dom; dom = get_next_domain(dom, true)) {
-        if (!dom->parent) {
+        if (!IS_SUBDOMAIN(dom)) {
             time_diff = now - dom->subdomains_last_checked.tv_sec;
         }
         if (strcasecmp(dom->name, name) == 0 ||
             (dom->flat_name != NULL &&
              strcasecmp(dom->flat_name, name) == 0)) {
             ret_dom = dom;
-            if (!dom->parent ||
-                (dom->parent && time_diff < rctx->domains_timeout)) {
+            if (!IS_SUBDOMAIN(dom) ||
+                (IS_SUBDOMAIN(dom) && time_diff < rctx->domains_timeout)) {
                 break;
             }
         }
diff --git a/src/responder/common/responder_get_domains.c b/src/responder/common/responder_get_domains.c
index b69875e1..defa4a43 100644
--- a/src/responder/common/responder_get_domains.c
+++ b/src/responder/common/responder_get_domains.c
@@ -353,7 +353,7 @@ static errno_t check_last_request(struct resp_ctx *rctx, const char *hint)
 
     if (hint != NULL) {
         for (dom = rctx->domains; dom; dom = get_next_domain(dom, true)) {
-            if (dom->parent == NULL) {
+            if (!IS_SUBDOMAIN(dom)) {
                 diff = now - dom->subdomains_last_checked.tv_sec;
                 /* not a subdomain */
                 continue;
diff --git a/src/responder/nss/nsssrv_cmd.c b/src/responder/nss/nsssrv_cmd.c
index 76b79ceb..12587ded 100644
--- a/src/responder/nss/nsssrv_cmd.c
+++ b/src/responder/nss/nsssrv_cmd.c
@@ -298,7 +298,7 @@ static int fill_pwent(struct sss_packet *packet,
     size_t dom_len = 0;
     int delim = 1;
     int i, ret, num, t;
-    bool add_domain = (dom->fqnames && (dom->parent == NULL));
+    bool add_domain = (!IS_SUBDOMAIN(dom) && dom->fqnames);
     const char *domain = dom->name;
     const char *namefmt;
     bool packet_initialized = false;
@@ -1903,7 +1903,7 @@ static int fill_members(struct sss_packet *packet,
     size_t blen;
 
     const char *domain = dom->name;
-    bool add_domain = (dom->fqnames && (dom->parent == NULL));
+    bool add_domain = (!IS_SUBDOMAIN(dom) && dom->fqnames);
 
     if (add_domain) {
         delim = 1;
@@ -2032,7 +2032,7 @@ static int fill_grent(struct sss_packet *packet,
     int i = 0;
     int ret, num, memnum;
     size_t rzero, rsize;
-    bool add_domain = (dom->fqnames && (dom->parent == NULL));
+    bool add_domain = (!IS_SUBDOMAIN(dom) && dom->fqnames);
     const char *domain = dom->name;
     const char *namefmt;
     TALLOC_CTX *tmp_ctx = NULL;
diff --git a/src/responder/pac/pacsrv_cmd.c b/src/responder/pac/pacsrv_cmd.c
index aeb41847..a8191bb9 100644
--- a/src/responder/pac/pacsrv_cmd.c
+++ b/src/responder/pac/pacsrv_cmd.c
@@ -453,7 +453,7 @@ struct tevent_req *pac_save_memberships_send(struct pac_req_ctx *pr_ctx)
     state->pr_ctx = pr_ctx;
 
     /* Remote users are members of local groups */
-    if (pr_ctx->dom->parent != NULL) {
+    if (IS_SUBDOMAIN(pr_ctx->dom)) {
         state->group_dom = pr_ctx->dom->parent;
     } else {
         state->group_dom = pr_ctx->dom;
-- 
cgit