Revert "IPA: new attribute map for non-posix groups"

This reverts commit 4c560e7b98e7ab71d22be24d2fbc468396cb634f.

6 files changed, 5 insertions, 46 deletions

diff --git a/src/providers/ipa/ipa_common.c b/src/providers/ipa/ipa_common.c
index 54d0ecf3b..f594de27a 100644
--- a/src/providers/ipa/ipa_common.c
+++ b/src/providers/ipa/ipa_common.c
@@ -568,15 +568,6 @@ int ipa_get_id_options(struct ipa_options *ipa_opts,
 
     ret = sdap_get_map(ipa_opts->id,
                        cdb, conf_path,
-                       ipa_np_group_map,
-                       SDAP_OPTS_NP_GROUP,
-                       &ipa_opts->id->np_group_map);
-    if (ret != EOK) {
-        goto done;
-    }
-
-    ret = sdap_get_map(ipa_opts->id,
-                       cdb, conf_path,
                        ipa_netgroup_map,
                        IPA_OPTS_NETGROUP,
                        &ipa_opts->id->netgroup_map);
diff --git a/src/providers/ipa/ipa_opts.h b/src/providers/ipa/ipa_opts.h
index 854163107..c7197beb1 100644
--- a/src/providers/ipa/ipa_opts.h
+++ b/src/providers/ipa/ipa_opts.h
@@ -215,14 +215,6 @@ struct sdap_attr_map ipa_group_map[] = {
     SDAP_ATTR_MAP_TERMINATOR
 };
 
-/* map for non-posix groups */
-struct sdap_attr_map ipa_np_group_map[] = {
-    { "ldap_group_object_class", "nestedgroup", SYSDB_GROUP_CLASS, NULL },
-    { "ldap_group_name", "cn", SYSDB_NAME, NULL },
-    { "ldap_group_member", "member", SYSDB_MEMBER, NULL },
-    SDAP_ATTR_MAP_TERMINATOR
-};
-
 struct sdap_attr_map ipa_netgroup_map[] = {
     { "ipa_netgroup_object_class", "ipaNisNetgroup", SYSDB_NETGROUP_CLASS, NULL },
     { "ipa_netgroup_name", "cn", SYSDB_NAME, NULL },
diff --git a/src/providers/ldap/ldap_id.c b/src/providers/ldap/ldap_id.c
index e164cde4c..c788b6bdd 100644
--- a/src/providers/ldap/ldap_id.c
+++ b/src/providers/ldap/ldap_id.c
@@ -919,7 +919,6 @@ struct groups_by_user_state {
 
     const char *name;
     const char **attrs;
-    const char **np_attrs;
 
     int dp_error;
     int sdap_ret;
@@ -967,10 +966,6 @@ static struct tevent_req *groups_by_user_send(TALLOC_CTX *memctx,
                                NULL, &state->attrs, NULL);
     if (ret != EOK) goto fail;
 
-    ret = build_attrs_from_map(state, ctx->opts->np_group_map, SDAP_OPTS_NP_GROUP,
-                               NULL, &state->np_attrs, NULL);
-    if (ret != EOK) goto fail;
-
     ret = groups_by_user_retry(req);
     if (ret != EOK) {
         goto fail;
@@ -1025,8 +1020,7 @@ static void groups_by_user_connect_done(struct tevent_req *subreq)
                                   state->ctx,
                                   state->conn,
                                   state->name,
-                                  state->attrs,
-                                  state->np_attrs);
+                                  state->attrs);
     if (!subreq) {
         tevent_req_error(req, ENOMEM);
         return;
diff --git a/src/providers/ldap/sdap.h b/src/providers/ldap/sdap.h
index 94048bfc7..6bab0e1c1 100644
--- a/src/providers/ldap/sdap.h
+++ b/src/providers/ldap/sdap.h
@@ -302,16 +302,6 @@ enum sdap_group_attrs {
     SDAP_OPTS_GROUP /* attrs counter */
 };
 
-/* the objectclass must be the first attribute.
- * Functions depend on this */
-enum sdap_np_group_attrs {
-    SDAP_OC_NP_GROUP = 0,
-    SDAP_AT_NP_GROUP_NAME,
-    SDAP_AT_NP_GROUP_MEMBER,
-
-    SDAP_OPTS_NP_GROUP /* attrs counter */
-};
-
 enum sdap_netgroup_attrs {
     SDAP_OC_NETGROUP = 0,
     SDAP_AT_NETGROUP_NAME,
@@ -424,7 +414,6 @@ struct sdap_options {
     struct sdap_attr_map *user_map;
     size_t user_map_cnt;
     struct sdap_attr_map *group_map;
-    struct sdap_attr_map *np_group_map;
     struct sdap_attr_map *netgroup_map;
     struct sdap_attr_map *service_map;
 
diff --git a/src/providers/ldap/sdap_async.h b/src/providers/ldap/sdap_async.h
index 2ed7cb7ea..808254a24 100644
--- a/src/providers/ldap/sdap_async.h
+++ b/src/providers/ldap/sdap_async.h
@@ -134,8 +134,7 @@ struct tevent_req *sdap_get_initgr_send(TALLOC_CTX *memctx,
                                         struct sdap_id_ctx *id_ctx,
                                         struct sdap_id_conn_ctx *conn,
                                         const char *name,
-                                        const char **grp_attrs,
-                                        const char **np_grp_attrs);
+                                        const char **grp_attrs);
 int sdap_get_initgr_recv(struct tevent_req *req);
 
 struct tevent_req *sdap_exop_modify_passwd_send(TALLOC_CTX *memctx,
diff --git a/src/providers/ldap/sdap_async_initgroups.c b/src/providers/ldap/sdap_async_initgroups.c
index 26840d7ca..80a6c332c 100644
--- a/src/providers/ldap/sdap_async_initgroups.c
+++ b/src/providers/ldap/sdap_async_initgroups.c
@@ -706,7 +706,6 @@ struct sdap_initgr_nested_state {
     const char *orig_dn;
 
     const char **grp_attrs;
-    const char **np_grp_attrs;
 
     struct ldb_message_element *memberof;
     char *filter;
@@ -736,8 +735,7 @@ static struct tevent_req *sdap_initgr_nested_send(TALLOC_CTX *memctx,
                                                   struct sss_domain_info *dom,
                                                   struct sdap_handle *sh,
                                                   struct sysdb_attrs *user,
-                                                  const char **grp_attrs,
-                                                  const char **np_grp_attrs)
+                                                  const char **grp_attrs)
 {
     struct tevent_req *req;
     struct sdap_initgr_nested_state *state;
@@ -2662,7 +2660,6 @@ struct sdap_get_initgr_state {
     struct sdap_id_conn_ctx *conn;
     const char *name;
     const char **grp_attrs;
-    const char **np_grp_attrs;
     const char **user_attrs;
     char *user_base_filter;
     char *filter;
@@ -2687,8 +2684,7 @@ struct tevent_req *sdap_get_initgr_send(TALLOC_CTX *memctx,
                                         struct sdap_id_ctx *id_ctx,
                                         struct sdap_id_conn_ctx *conn,
                                         const char *name,
-                                        const char **grp_attrs,
-                                        const char **np_grp_attrs)
+                                        const char **grp_attrs)
 {
     struct tevent_req *req;
     struct sdap_get_initgr_state *state;
@@ -3024,11 +3020,9 @@ static void sdap_get_initgr_user(struct tevent_req *subreq)
         break;
 
     case SDAP_SCHEMA_IPA_V1:
-
         subreq = sdap_initgr_nested_send(state, state->ev, state->opts,
                                          state->sysdb, state->dom, state->sh,
-                                         state->orig_user, state->grp_attrs,
-                                         state->np_grp_attrs);
+                                         state->orig_user, state->grp_attrs);
         if (!subreq) {
             tevent_req_error(req, ENOMEM);
             return;