From df85da09d078ae7bfdac9cc66fd79362719025e0 Mon Sep 17 00:00:00 2001
From: Jan Zeleny <jzeleny@redhat.com>
Date: Tue, 17 Apr 2012 04:47:21 -0400
Subject: Removed unused block of code is sdap_fill_memberships()

---
 src/providers/ldap/sdap_async_groups.c | 86 ++++++++++++----------------------
 1 file changed, 29 insertions(+), 57 deletions(-)

(limited to 'src/providers/ldap')

diff --git a/src/providers/ldap/sdap_async_groups.c b/src/providers/ldap/sdap_async_groups.c
index e616c2794..b19e2b670 100644
--- a/src/providers/ldap/sdap_async_groups.c
+++ b/src/providers/ldap/sdap_async_groups.c
@@ -102,70 +102,42 @@ static int sdap_fill_memberships(struct sysdb_attrs *group_attrs,
     int i, j;
     int ret;
 
-    switch (opts->schema_type) {
-    case SDAP_SCHEMA_RFC2307:
-        DEBUG(9, ("[RFC2307 Schema]\n"));
-
-        ret = sysdb_attrs_users_from_ldb_vals(group_attrs, SYSDB_MEMBER,
-                                              domain->name,
-                                              values, num_values);
-        if (ret) {
-            goto done;
-        }
-
-        break;
-
-    case SDAP_SCHEMA_RFC2307BIS:
-    case SDAP_SCHEMA_IPA_V1:
-    case SDAP_SCHEMA_AD:
-        DEBUG(9, ("[IPA or AD Schema]\n"));
-
-        ret = sysdb_attrs_get_el(group_attrs, SYSDB_MEMBER, &el);
-        if (ret) {
-            goto done;
-        }
-
-        /* Just allocate both big enough to contain all members for now */
-        el->values = talloc_realloc(el, el->values, struct ldb_val,
-                                    el->num_values + num_values);
-        if (!el->values) {
-            ret = ENOMEM;
-            goto done;
-        }
-
-        for (i = 0, j = el->num_values; i < num_values; i++) {
+    ret = sysdb_attrs_get_el(group_attrs, SYSDB_MEMBER, &el);
+    if (ret) {
+        goto done;
+    }
 
-            /* sync search entry with this as origDN */
-            ret = sdap_find_entry_by_origDN(el->values, ctx, domain,
-                                            (char *)values[i].data,
-                                            (char **)&el->values[j].data);
-            if (ret != EOK) {
-                if (ret != ENOENT) {
-                    goto done;
-                }
+    /* Just allocate both big enough to contain all members for now */
+    el->values = talloc_realloc(el, el->values, struct ldb_val,
+                                el->num_values + num_values);
+    if (!el->values) {
+        ret = ENOMEM;
+        goto done;
+    }
 
-                DEBUG(7, ("    member #%d (%s): not found!\n",
-                          i, (char *)values[i].data));
-            } else {
-                DEBUG(7, ("    member #%d (%s): [%s]\n",
-                          i, (char *)values[i].data,
-                          (char *)el->values[j].data));
+    for (i = 0, j = el->num_values; i < num_values; i++) {
 
-                el->values[j].length = strlen((char *)el->values[j].data);
-                j++;
+        /* sync search entry with this as origDN */
+        ret = sdap_find_entry_by_origDN(el->values, ctx, domain,
+                                        (char *)values[i].data,
+                                        (char **)&el->values[j].data);
+        if (ret != EOK) {
+            if (ret != ENOENT) {
+                goto done;
             }
-        }
-        el->num_values = j;
 
-        break;
+            DEBUG(7, ("    member #%d (%s): not found!\n",
+                      i, (char *)values[i].data));
+        } else {
+            DEBUG(7, ("    member #%d (%s): [%s]\n",
+                      i, (char *)values[i].data,
+                      (char *)el->values[j].data));
 
-    default:
-        DEBUG(0, ("FATAL ERROR: Unhandled schema type! (%d)\n",
-                  opts->schema_type));
-        ret = EFAULT;
-        goto done;
+            el->values[j].length = strlen((char *)el->values[j].data);
+            j++;
+        }
     }
-
+    el->num_values = j;
     ret = EOK;
 
 done:
-- 
cgit