URL: https://github.com/SSSD/sssd/pull/119
Author: lslebodn
Title: #119: Remove unused Attr type
Action: synchronized
To pull the PR as Git branch:
git remote add ghsssd https://github.com/SSSD/sssd
git fetch ghsssd pull/119/head:pr119
git checkout pr119
From b05638283964725a72b905fc5edf04ea27738044 Mon Sep 17 00:00:00 2001
From: Lukas Slebodnik <lsleb...@redhat.com>
Date: Fri, 6 Jan 2017 15:16:59 +0100
Subject: [PATCH 1/6] LDAP: Fix debug messages after errors in *_get_send
---
src/providers/ldap/ldap_id.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/providers/ldap/ldap_id.c b/src/providers/ldap/ldap_id.c
index fe0e219..26667a8 100644
--- a/src/providers/ldap/ldap_id.c
+++ b/src/providers/ldap/ldap_id.c
@@ -1730,7 +1730,7 @@ static struct tevent_req *get_user_and_group_send(TALLOC_CTX *memctx,
state->filter_val, state->filter_type,
state->attrs_type, state->noexist_delete, false);
if (subreq == NULL) {
- DEBUG(SSSDBG_OP_FAILURE, "users_get_send failed.\n");
+ DEBUG(SSSDBG_OP_FAILURE, "groups_get_send failed.\n");
ret = ENOMEM;
goto fail;
}
@@ -1792,7 +1792,7 @@ static void get_user_and_group_groups_done(struct tevent_req *subreq)
state->filter_val, state->filter_type, NULL,
state->attrs_type, state->noexist_delete);
if (subreq == NULL) {
- DEBUG(SSSDBG_OP_FAILURE, "groups_get_send failed.\n");
+ DEBUG(SSSDBG_OP_FAILURE, "users_get_send failed.\n");
tevent_req_error(req, ENOMEM);
return;
}
From 4e13e14b4168239906adfa93cb472774b49a017a Mon Sep 17 00:00:00 2001
From: Lukas Slebodnik <lsleb...@redhat.com>
Date: Fri, 6 Jan 2017 15:21:58 +0100
Subject: [PATCH 2/6] LDAP: Removed unused attr_type from users_get_send
---
src/providers/ldap/ldap_id.c | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/src/providers/ldap/ldap_id.c b/src/providers/ldap/ldap_id.c
index 26667a8..72dfc58 100644
--- a/src/providers/ldap/ldap_id.c
+++ b/src/providers/ldap/ldap_id.c
@@ -76,7 +76,6 @@ struct tevent_req *users_get_send(TALLOC_CTX *memctx,
const char *filter_value,
int filter_type,
const char *extra_value,
- int attrs_type,
bool noexist_delete)
{
struct tevent_req *req;
@@ -303,7 +302,6 @@ struct tevent_req *users_get_send(TALLOC_CTX *memctx,
goto done;
}
- /* TODO: handle attrs_type */
ret = build_attrs_from_map(state, ctx->opts->user_map,
ctx->opts->user_map_cnt,
NULL, &state->attrs, NULL);
@@ -1425,7 +1423,6 @@ sdap_handle_acct_req_send(TALLOC_CTX *mem_ctx,
ar->filter_value,
ar->filter_type,
ar->extra_value,
- ar->attr_type,
noexist_delete);
break;
@@ -1541,7 +1538,6 @@ sdap_handle_acct_req_send(TALLOC_CTX *mem_ctx,
ar->filter_value,
ar->filter_type,
ar->extra_value,
- ar->attr_type,
noexist_delete);
break;
@@ -1790,7 +1786,7 @@ static void get_user_and_group_groups_done(struct tevent_req *subreq)
subreq = users_get_send(req, state->ev, state->id_ctx,
state->sdom, user_conn,
state->filter_val, state->filter_type, NULL,
- state->attrs_type, state->noexist_delete);
+ state->noexist_delete);
if (subreq == NULL) {
DEBUG(SSSDBG_OP_FAILURE, "users_get_send failed.\n");
tevent_req_error(req, ENOMEM);
From 37620118218f3aad75ac5adb0d8fc1bd9404ffb5 Mon Sep 17 00:00:00 2001
From: Lukas Slebodnik <lsleb...@redhat.com>
Date: Fri, 6 Jan 2017 15:31:57 +0100
Subject: [PATCH 3/6] LDAP: Remove unused parameter attr_type from
groups_get_send
---
src/providers/ipa/ipa_subdomains_ext_groups.c | 2 +-
src/providers/ldap/ldap_common.h | 1 -
src/providers/ldap/ldap_id.c | 12 +-----------
src/providers/ldap/sdap_async_initgroups.c | 2 +-
src/providers/ldap/sdap_async_initgroups_ad.c | 2 +-
5 files changed, 4 insertions(+), 15 deletions(-)
diff --git a/src/providers/ipa/ipa_subdomains_ext_groups.c b/src/providers/ipa/ipa_subdomains_ext_groups.c
index 90460bc..d5727cc 100644
--- a/src/providers/ipa/ipa_subdomains_ext_groups.c
+++ b/src/providers/ipa/ipa_subdomains_ext_groups.c
@@ -888,7 +888,7 @@ static void ipa_add_ad_memberships_get_next(struct tevent_req *req)
state->sdap_id_ctx, state->group_sdom,
state->sdap_id_ctx->conn,
fq_name,
- BE_FILTER_NAME, BE_ATTR_CORE,
+ BE_FILTER_NAME,
false, false);
if (subreq == NULL) {
DEBUG(SSSDBG_OP_FAILURE, "groups_get_send failed.\n");
diff --git a/src/providers/ldap/ldap_common.h b/src/providers/ldap/ldap_common.h
index ff7ff28..1acda41 100644
--- a/src/providers/ldap/ldap_common.h
+++ b/src/providers/ldap/ldap_common.h
@@ -244,7 +244,6 @@ struct tevent_req *groups_get_send(TALLOC_CTX *memctx,
struct sdap_id_conn_ctx *conn,
const char *name,
int filter_type,
- int attrs_type,
bool noexist_delete,
bool no_members);
int groups_get_recv(struct tevent_req *req, int *dp_error_out, int *sdap_ret);
diff --git a/src/providers/ldap/ldap_id.c b/src/providers/ldap/ldap_id.c
index 72dfc58..54120bb 100644
--- a/src/providers/ldap/ldap_id.c
+++ b/src/providers/ldap/ldap_id.c
@@ -651,7 +651,6 @@ struct tevent_req *groups_get_send(TALLOC_CTX *memctx,
struct sdap_id_conn_ctx *conn,
const char *filter_value,
int filter_type,
- int attrs_type,
bool noexist_delete,
bool no_members)
{
@@ -837,7 +836,6 @@ struct tevent_req *groups_get_send(TALLOC_CTX *memctx,
member_filter[0] = (const char *)ctx->opts->group_map[SDAP_AT_GROUP_MEMBER].name;
member_filter[1] = NULL;
- /* TODO: handle attrs_type */
ret = build_attrs_from_map(state, ctx->opts->group_map, SDAP_OPTS_GROUP,
(state->domain->ignore_group_members
|| state->no_members) ?
@@ -1354,7 +1352,6 @@ static struct tevent_req *get_user_and_group_send(TALLOC_CTX *memctx,
struct sdap_id_conn_ctx *conn,
const char *filter_value,
int filter_type,
- int attrs_type,
bool noexist_delete);
errno_t sdap_get_user_and_group_recv(struct tevent_req *req,
@@ -1431,7 +1428,6 @@ sdap_handle_acct_req_send(TALLOC_CTX *mem_ctx,
sdom, conn,
ar->filter_value,
ar->filter_type,
- ar->attr_type,
noexist_delete, false);
break;
@@ -1497,7 +1493,6 @@ sdap_handle_acct_req_send(TALLOC_CTX *mem_ctx,
sdom, conn,
ar->filter_value,
ar->filter_type,
- ar->attr_type,
noexist_delete);
break;
@@ -1512,7 +1507,6 @@ sdap_handle_acct_req_send(TALLOC_CTX *mem_ctx,
sdom, conn,
ar->filter_value,
ar->filter_type,
- ar->attr_type,
noexist_delete);
break;
@@ -1528,7 +1522,6 @@ sdap_handle_acct_req_send(TALLOC_CTX *mem_ctx,
sdom, conn,
ar->filter_value,
ar->filter_type,
- ar->attr_type,
noexist_delete);
break;
@@ -1667,7 +1660,6 @@ struct get_user_and_group_state {
const char *filter_val;
int filter_type;
- int attrs_type;
char *filter;
const char **attrs;
@@ -1687,7 +1679,6 @@ static struct tevent_req *get_user_and_group_send(TALLOC_CTX *memctx,
struct sdap_id_conn_ctx *conn,
const char *filter_val,
int filter_type,
- int attrs_type,
bool noexist_delete)
{
struct tevent_req *req;
@@ -1719,12 +1710,11 @@ static struct tevent_req *get_user_and_group_send(TALLOC_CTX *memctx,
state->sysdb = sdom->dom->sysdb;
state->filter_val = filter_val;
state->filter_type = filter_type;
- state->attrs_type = attrs_type;
subreq = groups_get_send(req, state->ev, state->id_ctx,
state->sdom, state->conn,
state->filter_val, state->filter_type,
- state->attrs_type, state->noexist_delete, false);
+ state->noexist_delete, false);
if (subreq == NULL) {
DEBUG(SSSDBG_OP_FAILURE, "groups_get_send failed.\n");
ret = ENOMEM;
diff --git a/src/providers/ldap/sdap_async_initgroups.c b/src/providers/ldap/sdap_async_initgroups.c
index 9b505e7..2cd9c15 100644
--- a/src/providers/ldap/sdap_async_initgroups.c
+++ b/src/providers/ldap/sdap_async_initgroups.c
@@ -3326,7 +3326,7 @@ static void sdap_get_initgr_done(struct tevent_req *subreq)
subreq = groups_get_send(req, state->ev, state->id_ctx,
state->id_ctx->opts->sdom, state->conn,
- gid, BE_FILTER_IDNUM, BE_ATTR_ALL, false,
+ gid, BE_FILTER_IDNUM, false,
false);
if (!subreq) {
ret = ENOMEM;
diff --git a/src/providers/ldap/sdap_async_initgroups_ad.c b/src/providers/ldap/sdap_async_initgroups_ad.c
index 1fee4ab..f75b921 100644
--- a/src/providers/ldap/sdap_async_initgroups_ad.c
+++ b/src/providers/ldap/sdap_async_initgroups_ad.c
@@ -630,7 +630,7 @@ static errno_t sdap_ad_resolve_sids_step(struct tevent_req *req)
subreq = groups_get_send(state, state->ev, state->id_ctx, sdap_domain,
state->conn, state->current_sid,
- BE_FILTER_SECID, BE_ATTR_CORE, false, true);
+ BE_FILTER_SECID, false, true);
if (subreq == NULL) {
return ENOMEM;
}
From acf933fa9bd560df3efa0f015bc606945384f5a0 Mon Sep 17 00:00:00 2001
From: Lukas Slebodnik <lsleb...@redhat.com>
Date: Tue, 10 Jan 2017 15:25:09 +0100
Subject: [PATCH 4/6] DP: Remove unused constants BE_ATTR_*
Neither BE_ATTR_MEM nor BE_ATTR_ALL are set anywhere in sssd.code.
sh$ git grep -E "BE_ATTR_ALL|BE_ATTR_MEM"
src/providers/data_provider.h:#define BE_ATTR_MEM 2
src/providers/data_provider.h:#define BE_ATTR_ALL 3
src/providers/data_provider/dp_target_id.c: case BE_ATTR_MEM:
src/providers/data_provider/dp_target_id.c: case BE_ATTR_ALL:
---
src/providers/data_provider.h | 2 --
src/providers/data_provider/dp_target_id.c | 2 --
2 files changed, 4 deletions(-)
diff --git a/src/providers/data_provider.h b/src/providers/data_provider.h
index 14a0902..1030f15 100644
--- a/src/providers/data_provider.h
+++ b/src/providers/data_provider.h
@@ -121,8 +121,6 @@
#define DP_ERR_FATAL 3
#define BE_ATTR_CORE 1
-#define BE_ATTR_MEM 2
-#define BE_ATTR_ALL 3
#define BE_FILTER_NAME 1
#define BE_FILTER_IDNUM 2
diff --git a/src/providers/data_provider/dp_target_id.c b/src/providers/data_provider/dp_target_id.c
index c69133f..f92d3b8 100644
--- a/src/providers/data_provider/dp_target_id.c
+++ b/src/providers/data_provider/dp_target_id.c
@@ -34,8 +34,6 @@ static bool check_attr_type(uint32_t attr_type)
{
switch (attr_type) {
case BE_ATTR_CORE:
- case BE_ATTR_MEM:
- case BE_ATTR_ALL:
return true;
default:
return false;
From 9e5d57f6992f17fd6b830772f76ec325686a42a0 Mon Sep 17 00:00:00 2001
From: Lukas Slebodnik <lsleb...@redhat.com>
Date: Fri, 6 Jan 2017 15:58:17 +0100
Subject: [PATCH 5/6] DP: Remove unused attr_type from struct dp_id_data
Structure member attr_type was set to BE_ATTR_CORE on all places
and there was a single place src/providers/ldap/ldap_id.c where
we checked to other values. It is not used anymore; it's better to
remove it.
---
src/providers/data_provider.h | 2 --
src/providers/data_provider/dp_custom_data.h | 1 -
src/providers/data_provider/dp_iface.h | 1 -
src/providers/data_provider/dp_iface.xml | 1 -
src/providers/data_provider/dp_iface_generated.c | 22 ++++++++------------
src/providers/data_provider/dp_iface_generated.h | 2 +-
src/providers/data_provider/dp_target_id.c | 26 ++++--------------------
src/providers/ipa/ipa_id.c | 1 -
src/providers/ipa/ipa_subdomains_id.c | 1 -
src/providers/ldap/ldap_id.c | 5 -----
src/providers/ldap/sdap_refresh.c | 1 -
src/providers/proxy/proxy_id.c | 6 ------
src/providers/simple/simple_access_check.c | 1 -
src/responder/common/responder_dp.c | 6 ++----
14 files changed, 16 insertions(+), 60 deletions(-)
diff --git a/src/providers/data_provider.h b/src/providers/data_provider.h
index 1030f15..46d9910 100644
--- a/src/providers/data_provider.h
+++ b/src/providers/data_provider.h
@@ -120,8 +120,6 @@
#define DP_ERR_TIMEOUT 2
#define DP_ERR_FATAL 3
-#define BE_ATTR_CORE 1
-
#define BE_FILTER_NAME 1
#define BE_FILTER_IDNUM 2
#define BE_FILTER_ENUM 3
diff --git a/src/providers/data_provider/dp_custom_data.h b/src/providers/data_provider/dp_custom_data.h
index 21a5890..d9de288 100644
--- a/src/providers/data_provider/dp_custom_data.h
+++ b/src/providers/data_provider/dp_custom_data.h
@@ -45,7 +45,6 @@ struct dp_subdomains_data {
struct dp_id_data {
uint32_t entry_type;
- uint32_t attr_type;
uint32_t filter_type;
const char *filter_value;
const char *extra_value;
diff --git a/src/providers/data_provider/dp_iface.h b/src/providers/data_provider/dp_iface.h
index 5c6f0eb..8ae7a2a 100644
--- a/src/providers/data_provider/dp_iface.h
+++ b/src/providers/data_provider/dp_iface.h
@@ -35,7 +35,6 @@ errno_t dp_get_account_info_handler(struct sbus_request *sbus_req,
void *dp_cli,
uint32_t dp_flags,
uint32_t entry_type,
- uint32_t attr_type,
const char *filter,
const char *domain,
const char *extra);
diff --git a/src/providers/data_provider/dp_iface.xml b/src/providers/data_provider/dp_iface.xml
index 992848a..a396987 100644
--- a/src/providers/data_provider/dp_iface.xml
+++ b/src/providers/data_provider/dp_iface.xml
@@ -66,7 +66,6 @@
<method name="getAccountInfo">
<arg name="dp_flags" type="u" direction="in" />
<arg name="entry_type" type="u" direction="in" />
- <arg name="attr_type" type="u" direction="in" />
<arg name="filter" type="s" direction="in" />
<arg name="domain" type="s" direction="in" />
<arg name="extra" type="s" direction="in" />
diff --git a/src/providers/data_provider/dp_iface_generated.c b/src/providers/data_provider/dp_iface_generated.c
index fd2acb4..25ec0e2 100644
--- a/src/providers/data_provider/dp_iface_generated.c
+++ b/src/providers/data_provider/dp_iface_generated.c
@@ -15,8 +15,8 @@ static int invoke_us_method(struct sbus_request *dbus_req, void *function_ptr);
/* invokes a handler with a 'uss' DBus signature */
static int invoke_uss_method(struct sbus_request *dbus_req, void *function_ptr);
-/* invokes a handler with a 'uuusss' DBus signature */
-static int invoke_uuusss_method(struct sbus_request *dbus_req, void *function_ptr);
+/* invokes a handler with a 'uusss' DBus signature */
+static int invoke_uusss_method(struct sbus_request *dbus_req, void *function_ptr);
/* arguments for org.freedesktop.sssd.DataProvider.Client.Register */
const struct sbus_arg_meta iface_dp_client_Register__in[] = {
@@ -260,7 +260,6 @@ int iface_dp_getDomains_finish(struct sbus_request *req, uint16_t arg_dp_error,
const struct sbus_arg_meta iface_dp_getAccountInfo__in[] = {
{ "dp_flags", "u" },
{ "entry_type", "u" },
- { "attr_type", "u" },
{ "filter", "s" },
{ "domain", "s" },
{ "extra", "s" },
@@ -326,7 +325,7 @@ const struct sbus_method_meta iface_dp__methods[] = {
iface_dp_getAccountInfo__in,
iface_dp_getAccountInfo__out,
offsetof(struct iface_dp, getAccountInfo),
- invoke_uuusss_method,
+ invoke_uusss_method,
},
{ NULL, }
};
@@ -378,24 +377,22 @@ static int invoke_uss_method(struct sbus_request *dbus_req, void *function_ptr)
arg_2);
}
-/* invokes a handler with a 'uuusss' DBus signature */
-static int invoke_uuusss_method(struct sbus_request *dbus_req, void *function_ptr)
+/* invokes a handler with a 'uusss' DBus signature */
+static int invoke_uusss_method(struct sbus_request *dbus_req, void *function_ptr)
{
uint32_t arg_0;
uint32_t arg_1;
- uint32_t arg_2;
+ const char * arg_2;
const char * arg_3;
const char * arg_4;
- const char * arg_5;
- int (*handler)(struct sbus_request *, void *, uint32_t, uint32_t, uint32_t, const char *, const char *, const char *) = function_ptr;
+ int (*handler)(struct sbus_request *, void *, uint32_t, uint32_t, const char *, const char *, const char *) = function_ptr;
if (!sbus_request_parse_or_finish(dbus_req,
DBUS_TYPE_UINT32, &arg_0,
DBUS_TYPE_UINT32, &arg_1,
- DBUS_TYPE_UINT32, &arg_2,
+ DBUS_TYPE_STRING, &arg_2,
DBUS_TYPE_STRING, &arg_3,
DBUS_TYPE_STRING, &arg_4,
- DBUS_TYPE_STRING, &arg_5,
DBUS_TYPE_INVALID)) {
return EOK; /* request handled */
}
@@ -405,8 +402,7 @@ static int invoke_uuusss_method(struct sbus_request *dbus_req, void *function_pt
arg_1,
arg_2,
arg_3,
- arg_4,
- arg_5);
+ arg_4);
}
/* invokes a handler with a 'us' DBus signature */
diff --git a/src/providers/data_provider/dp_iface_generated.h b/src/providers/data_provider/dp_iface_generated.h
index 7c2216a..c14b810 100644
--- a/src/providers/data_provider/dp_iface_generated.h
+++ b/src/providers/data_provider/dp_iface_generated.h
@@ -95,7 +95,7 @@ struct iface_dp {
int (*autofsHandler)(struct sbus_request *req, void *data, uint32_t arg_dp_flags, const char *arg_mapname);
int (*hostHandler)(struct sbus_request *req, void *data, uint32_t arg_dp_flags, const char *arg_name, const char *arg_alias);
int (*getDomains)(struct sbus_request *req, void *data, const char *arg_domain_hint);
- int (*getAccountInfo)(struct sbus_request *req, void *data, uint32_t arg_dp_flags, uint32_t arg_entry_type, uint32_t arg_attr_type, const char *arg_filter, const char *arg_domain, const char *arg_extra);
+ int (*getAccountInfo)(struct sbus_request *req, void *data, uint32_t arg_dp_flags, uint32_t arg_entry_type, const char *arg_filter, const char *arg_domain, const char *arg_extra);
};
/* finish function for autofsHandler */
diff --git a/src/providers/data_provider/dp_target_id.c b/src/providers/data_provider/dp_target_id.c
index f92d3b8..0bca9ba 100644
--- a/src/providers/data_provider/dp_target_id.c
+++ b/src/providers/data_provider/dp_target_id.c
@@ -30,18 +30,6 @@
#define FILTER_TYPE(str, type) {str "=", sizeof(str "=") - 1, type}
-static bool check_attr_type(uint32_t attr_type)
-{
- switch (attr_type) {
- case BE_ATTR_CORE:
- return true;
- default:
- return false;
- }
-
- return false;
-}
-
static bool check_and_parse_filter(struct dp_id_data *data,
const char *filter,
const char *extra)
@@ -252,7 +240,6 @@ errno_t dp_get_account_info_handler(struct sbus_request *sbus_req,
void *dp_cli,
uint32_t dp_flags,
uint32_t entry_type,
- uint32_t attr_type,
const char *filter,
const char *domain,
const char *extra)
@@ -261,17 +248,12 @@ errno_t dp_get_account_info_handler(struct sbus_request *sbus_req,
const char *key;
errno_t ret;
- if (!check_attr_type(attr_type)) {
- return EINVAL;
- }
-
data = talloc_zero(sbus_req, struct dp_id_data);
if (data == NULL) {
return ENOMEM;
}
data->entry_type = entry_type;
- data->attr_type = attr_type;
data->domain = domain;
if (!check_and_parse_filter(data, filter, extra)) {
@@ -280,12 +262,12 @@ errno_t dp_get_account_info_handler(struct sbus_request *sbus_req,
}
DEBUG(SSSDBG_FUNC_DATA,
- "Got request for [%#"PRIx32"][%s][%"PRId32"][%s]\n",
+ "Got request for [%#"PRIx32"][%s][%s]\n",
data->entry_type, be_req2str(data->entry_type),
- attr_type, filter);
+ filter);
- key = talloc_asprintf(data, "%u:%u:%s:%s:%s", data->entry_type,
- data->attr_type, extra, domain, filter);
+ key = talloc_asprintf(data, "%u:%s:%s:%s", data->entry_type,
+ extra, domain, filter);
if (key == NULL) {
ret = ENOMEM;
goto done;
diff --git a/src/providers/ipa/ipa_id.c b/src/providers/ipa/ipa_id.c
index 7f0cd56..54af991 100644
--- a/src/providers/ipa/ipa_id.c
+++ b/src/providers/ipa/ipa_id.c
@@ -671,7 +671,6 @@ static void ipa_id_get_account_info_got_override(struct tevent_req *subreq)
"Switching back to BE_REQ_INITGROUPS.\n");
state->ar->entry_type = BE_REQ_INITGROUPS;
state->ar->filter_type = BE_FILTER_UUID;
- state->ar->attr_type = BE_ATTR_CORE;
}
} else {
diff --git a/src/providers/ipa/ipa_subdomains_id.c b/src/providers/ipa/ipa_subdomains_id.c
index 97c96e3..0d74e20 100644
--- a/src/providers/ipa/ipa_subdomains_id.c
+++ b/src/providers/ipa/ipa_subdomains_id.c
@@ -237,7 +237,6 @@ static void ipa_subdomain_account_got_override(struct tevent_req *subreq)
"Switching back to BE_REQ_INITGROUPS.\n");
ar->entry_type = BE_REQ_INITGROUPS;
ar->filter_type = BE_FILTER_SECID;
- ar->attr_type = BE_ATTR_CORE;
}
} else {
DEBUG(SSSDBG_CRIT_FAILURE,
diff --git a/src/providers/ldap/ldap_id.c b/src/providers/ldap/ldap_id.c
index 54120bb..70300e6 100644
--- a/src/providers/ldap/ldap_id.c
+++ b/src/providers/ldap/ldap_id.c
@@ -1439,11 +1439,6 @@ sdap_handle_acct_req_send(TALLOC_CTX *mem_ctx,
state->err = "Invalid filter type";
goto done;
}
- if (ar->attr_type != BE_ATTR_CORE) {
- ret = EINVAL;
- state->err = "Invalid attr type";
- goto done;
- }
subreq = groups_by_user_send(state, be_ctx->ev, id_ctx,
sdom, conn,
diff --git a/src/providers/ldap/sdap_refresh.c b/src/providers/ldap/sdap_refresh.c
index 59619b1..6d6c43e 100644
--- a/src/providers/ldap/sdap_refresh.c
+++ b/src/providers/ldap/sdap_refresh.c
@@ -95,7 +95,6 @@ static struct tevent_req *sdap_refresh_send(TALLOC_CTX *mem_ctx,
}
state->account_req->entry_type = entry_type;
- state->account_req->attr_type = BE_ATTR_CORE;
state->account_req->filter_type = BE_FILTER_NAME;
state->account_req->extra_value = NULL;
state->account_req->domain = domain->name;
diff --git a/src/providers/proxy/proxy_id.c b/src/providers/proxy/proxy_id.c
index 48f5529..3d27289 100644
--- a/src/providers/proxy/proxy_id.c
+++ b/src/providers/proxy/proxy_id.c
@@ -1446,12 +1446,6 @@ proxy_account_info(TALLOC_CTX *mem_ctx,
sysdb = domain->sysdb;
- /* For now we support only core attrs. */
- if (data->attr_type != BE_ATTR_CORE) {
- dp_reply_std_set(&reply, DP_ERR_FATAL, EINVAL, "Invalid attr type");
- return reply;
- }
-
/* Proxy provider does not support security ID lookups. */
if (data->filter_type == BE_FILTER_SECID) {
dp_reply_std_set(&reply, DP_ERR_FATAL, ENOSYS,
diff --git a/src/providers/simple/simple_access_check.c b/src/providers/simple/simple_access_check.c
index 227a9c6..f894f61 100644
--- a/src/providers/simple/simple_access_check.c
+++ b/src/providers/simple/simple_access_check.c
@@ -259,7 +259,6 @@ simple_resolve_group_send(TALLOC_CTX *mem_ctx,
}
ar->entry_type = BE_REQ_GROUP;
- ar->attr_type = BE_ATTR_CORE;
ar->filter_type = BE_FILTER_IDNUM;
ar->filter_value = talloc_asprintf(ar, "%llu", (unsigned long long) gid);
ar->domain = talloc_strdup(ar, state->domain->name);
diff --git a/src/responder/common/responder_dp.c b/src/responder/common/responder_dp.c
index 86051a1..da67676 100644
--- a/src/responder/common/responder_dp.c
+++ b/src/responder/common/responder_dp.c
@@ -551,7 +551,6 @@ sss_dp_get_account_msg(void *pvt)
struct sss_dp_account_info *info;
uint32_t dp_flags;
uint32_t entry_type;
- uint32_t attrs_type = BE_ATTR_CORE;
char *filter;
info = talloc_get_type(pvt, struct sss_dp_account_info);
@@ -623,8 +622,8 @@ sss_dp_get_account_msg(void *pvt)
/* create the message */
DEBUG(SSSDBG_TRACE_FUNC,
- "Creating request for [%s][%#x][%s][%d][%s:%s]\n",
- info->dom->name, entry_type, be_req2str(entry_type), attrs_type,
+ "Creating request for [%s][%#x][%s][%s:%s]\n",
+ info->dom->name, entry_type, be_req2str(entry_type),
filter, info->extra == NULL ? "-" : info->extra);
if (info->extra == NULL) {
@@ -635,7 +634,6 @@ sss_dp_get_account_msg(void *pvt)
dbret = dbus_message_append_args(msg,
DBUS_TYPE_UINT32, &dp_flags,
DBUS_TYPE_UINT32, &entry_type,
- DBUS_TYPE_UINT32, &attrs_type,
DBUS_TYPE_STRING, &filter,
DBUS_TYPE_STRING, &info->dom->name,
DBUS_TYPE_STRING, &info->extra,
From 6c3c02a1a07e4605b1ca222243560c68feaa7103 Mon Sep 17 00:00:00 2001
From: Lukas Slebodnik <lsleb...@redhat.com>
Date: Fri, 13 Jan 2017 17:07:06 +0100
Subject: [PATCH 6/6] LDAP: Remove attrs_type related TODO comments
---
src/providers/ldap/sdap_async_enum.c | 2 --
src/providers/ldap/sdap_async_services.c | 1 -
2 files changed, 3 deletions(-)
diff --git a/src/providers/ldap/sdap_async_enum.c b/src/providers/ldap/sdap_async_enum.c
index a7ad560..387e531 100644
--- a/src/providers/ldap/sdap_async_enum.c
+++ b/src/providers/ldap/sdap_async_enum.c
@@ -617,7 +617,6 @@ static struct tevent_req *enum_users_send(TALLOC_CTX *memctx,
goto fail;
}
- /* TODO: handle attrs_type */
ret = build_attrs_from_map(state, ctx->opts->user_map,
ctx->opts->user_map_cnt,
NULL, &state->attrs, NULL);
@@ -796,7 +795,6 @@ static struct tevent_req *enum_groups_send(TALLOC_CTX *memctx,
goto fail;
}
- /* TODO: handle attrs_type */
ret = build_attrs_from_map(state, ctx->opts->group_map, SDAP_OPTS_GROUP,
NULL, &state->attrs, NULL);
if (ret != EOK) goto fail;
diff --git a/src/providers/ldap/sdap_async_services.c b/src/providers/ldap/sdap_async_services.c
index 72758f2..eebe239 100644
--- a/src/providers/ldap/sdap_async_services.c
+++ b/src/providers/ldap/sdap_async_services.c
@@ -572,7 +572,6 @@ enum_services_send(TALLOC_CTX *memctx,
goto fail;
}
- /* TODO: handle attrs_type */
ret = build_attrs_from_map(state, id_ctx->opts->service_map,
SDAP_OPTS_SERVICES, NULL,
&state->attrs, NULL);
_______________________________________________
sssd-devel mailing list -- sssd-devel@lists.fedorahosted.org
To unsubscribe send an email to sssd-devel-le...@lists.fedorahosted.org
