UTIL: Store UPN suffixes when creating a new subdomain

We used to store UPN suffixes pointer into the domain structure only if
the domain changed, not when a new domain was created. As an effect, the
enterprise principals flag was not enabled unless a domain changed,
preventing logins with enterprise principals.

Reviewed-by: Sumit Bose <sbose@redhat.com>

2 files changed, 11 insertions, 1 deletions

diff --git a/src/db/sysdb_private.h b/src/db/sysdb_private.h
index b6bf3706e..bfd247999 100644
--- a/src/db/sysdb_private.h
+++ b/src/db/sysdb_private.h
@@ -190,6 +190,7 @@ struct sss_domain_info *new_subdomain(TALLOC_CTX *mem_ctx,
                                       bool mpg,
                                       bool enumerate,
                                       const char *forest,
+                                      const char **upn_suffixes,
                                       uint32_t trust_direction);
 
 /* Helper functions to deal with the timestamp cache should not be used
diff --git a/src/db/sysdb_subdomains.c b/src/db/sysdb_subdomains.c
index 1f43bfc12..01f49763b 100644
--- a/src/db/sysdb_subdomains.c
+++ b/src/db/sysdb_subdomains.c
@@ -32,6 +32,7 @@ struct sss_domain_info *new_subdomain(TALLOC_CTX *mem_ctx,
                                       bool mpg,
                                       bool enumerate,
                                       const char *forest,
+                                      const char **upn_suffixes,
                                       uint32_t trust_direction)
 {
     struct sss_domain_info *dom;
@@ -108,6 +109,14 @@ struct sss_domain_info *new_subdomain(TALLOC_CTX *mem_ctx,
         }
     }
 
+    if (upn_suffixes != NULL) {
+        dom->upn_suffixes = dup_string_list(dom, upn_suffixes);
+        if (dom->upn_suffixes == NULL) {
+            DEBUG(SSSDBG_OP_FAILURE, "Failed to copy UPN upn_suffixes.\n");
+            goto fail;
+        }
+    }
+
     dom->enumerate = enumerate;
     dom->fqnames = true;
     dom->mpg = mpg;
@@ -442,7 +451,7 @@ errno_t sysdb_update_subdomains(struct sss_domain_info *domain)
         if (dom == NULL) {
             dom = new_subdomain(domain, domain, name, realm,
                                 flat, id, mpg, enumerate, forest,
-                                trust_direction);
+                                upn_suffixes, trust_direction);
             if (dom == NULL) {
                 ret = ENOMEM;
                 goto done;