diff options
| -rw-r--r-- | src/providers/backend.h | 9 | ||||
| -rw-r--r-- | src/providers/data_provider/dp_custom_data.h | 5 | ||||
| -rw-r--r-- | src/providers/data_provider/dp_target_id.c | 6 |
3 files changed, 4 insertions, 16 deletions
diff --git a/src/providers/backend.h b/src/providers/backend.h index 739e935fc..ba0bc5927 100644 --- a/src/providers/backend.h +++ b/src/providers/backend.h @@ -91,15 +91,6 @@ struct be_ctx { struct data_provider *provider; }; -struct be_acct_req { - int entry_type; - int attr_type; - int filter_type; - char *filter_value; - char *extra_value; - char *domain; -}; - bool be_is_offline(struct be_ctx *ctx); void be_mark_offline(struct be_ctx *ctx); void be_mark_dom_offline(struct sss_domain_info *dom, struct be_ctx *ctx); diff --git a/src/providers/data_provider/dp_custom_data.h b/src/providers/data_provider/dp_custom_data.h index decc0f4e8..d4cb7e386 100644 --- a/src/providers/data_provider/dp_custom_data.h +++ b/src/providers/data_provider/dp_custom_data.h @@ -43,9 +43,7 @@ struct dp_subdomains_data { const char *domain_hint; }; -/* TODO rename be_acct_req to dp_id_data to be consistent - This can be done after the original code is removed. -struct dp_id_data { +struct be_acct_req { uint32_t entry_type; uint32_t attr_type; uint32_t filter_type; @@ -53,7 +51,6 @@ struct dp_id_data { const char *extra_value; const char *domain; }; -*/ /* Reply private data. */ diff --git a/src/providers/data_provider/dp_target_id.c b/src/providers/data_provider/dp_target_id.c index 855bcd895..66fa125b4 100644 --- a/src/providers/data_provider/dp_target_id.c +++ b/src/providers/data_provider/dp_target_id.c @@ -69,8 +69,8 @@ static bool check_and_parse_filter(struct be_acct_req *data, for (i = 0; types[i].name != NULL; i++) { if (strncmp(filter, types[i].name, types[i].lenght) == 0) { data->filter_type = types[i].type; - data->filter_value = discard_const(&filter[types[i].lenght]); /* todo remove discard const */ - data->extra_value = discard_const(extra); /* todo remove discard const */ + data->filter_value = &filter[types[i].lenght]; + data->extra_value = extra; return true; } } @@ -275,7 +275,7 @@ errno_t dp_get_account_info_handler(struct sbus_request *sbus_req, data->entry_type = entry_type; data->attr_type = attr_type; - data->domain = discard_const(domain); /* todo remove discard const */ + data->domain = domain; if (!check_and_parse_filter(data, filter, extra)) { ret = EINVAL; |