From d27d7f2c270b69d0805633c4bedcf6d806acd5cd Mon Sep 17 00:00:00 2001
From: Jakub Hrozek <jhrozek@redhat.com>
Date: Wed, 29 May 2013 16:01:23 +0200
Subject: LDAP: Do not store separate GID for subdomain users

As the subdomains are MPG domains, we don't want to store a separate GID
for the subdomain users, but rather just create a UPG.
---
 src/providers/ldap/sdap_async_users.c | 28 ++++++++++++++++++----------
 1 file changed, 18 insertions(+), 10 deletions(-)

(limited to 'src')

diff --git a/src/providers/ldap/sdap_async_users.c b/src/providers/ldap/sdap_async_users.c
index e4d224cc8..a368965f6 100644
--- a/src/providers/ldap/sdap_async_users.c
+++ b/src/providers/ldap/sdap_async_users.c
@@ -267,13 +267,20 @@ int sdap_save_user(TALLOC_CTX *memctx,
     }
 
     if (use_id_mapping) {
-        ret = sdap_get_idmap_primary_gid(opts, attrs, sid_str, dom_sid_str,
-                                         &gid);
-        if (ret) {
-            DEBUG(SSSDBG_CRIT_FAILURE,
-                  ("Cannot get the GID for [%s] in domain [%s].\n",
-                   name, dom->name));
-            goto done;
+        if (IS_SUBDOMAIN(dom) == false) {
+            ret = sdap_get_idmap_primary_gid(opts, attrs, sid_str, dom_sid_str,
+                                             &gid);
+            if (ret) {
+                DEBUG(SSSDBG_CRIT_FAILURE,
+                    ("Cannot get the GID for [%s] in domain [%s].\n",
+                    name, dom->name));
+                goto done;
+            }
+        } else {
+            /* For subdomain users, only create the private group as
+             * the subdomain is an MPG domain
+             */
+            gid = 0;
         }
 
         /* Store the GID in the ldap_attrs so it doesn't get
@@ -294,9 +301,10 @@ int sdap_save_user(TALLOC_CTX *memctx,
     }
 
     /* check that the gid is valid for this domain */
-    if (OUT_OF_ID_RANGE(gid, dom->id_min, dom->id_max)) {
-            DEBUG(2, ("User [%s] filtered out! (primary gid out of range)\n",
-                      name));
+    if (IS_SUBDOMAIN(dom) == false &&
+            OUT_OF_ID_RANGE(gid, dom->id_min, dom->id_max)) {
+        DEBUG(SSSDBG_CRIT_FAILURE,
+              ("User [%s] filtered out! (primary gid out of range)\n", name));
         ret = EINVAL;
         goto done;
     }
-- 
cgit