summaryrefslogtreecommitdiffstats
path: root/src/responder/nss
diff options
context:
space:
mode:
Diffstat (limited to 'src/responder/nss')
-rw-r--r--src/responder/nss/nss_private.h11
-rw-r--r--src/responder/nss/nss_protocol_grent.c2
-rw-r--r--src/responder/nss/nss_utils.c87
3 files changed, 1 insertions, 99 deletions
diff --git a/src/responder/nss/nss_private.h b/src/responder/nss/nss_private.h
index acb3c4aa5..13de83226 100644
--- a/src/responder/nss/nss_private.h
+++ b/src/responder/nss/nss_private.h
@@ -140,17 +140,6 @@ const char *
nss_get_name_from_msg(struct sss_domain_info *domain,
struct ldb_message *msg);
-int sized_output_name(TALLOC_CTX *mem_ctx,
- struct resp_ctx *rctx,
- const char *orig_name,
- struct sss_domain_info *name_dom,
- struct sized_string **_name);
-
-int sized_member_name(TALLOC_CTX *mem_ctx,
- struct resp_ctx *rctx,
- const char *member_name,
- struct sized_string **_name);
-
const char *
nss_get_pwfield(struct nss_ctx *nctx,
struct sss_domain_info *dom);
diff --git a/src/responder/nss/nss_protocol_grent.c b/src/responder/nss/nss_protocol_grent.c
index 283ab9f67..fae1d47d7 100644
--- a/src/responder/nss/nss_protocol_grent.c
+++ b/src/responder/nss/nss_protocol_grent.c
@@ -163,7 +163,7 @@ nss_protocol_fill_members(struct sss_packet *packet,
}
}
- ret = sized_member_name(tmp_ctx, rctx, member_name, &name);
+ ret = sized_domain_name(tmp_ctx, rctx, member_name, &name);
if (ret != EOK) {
DEBUG(SSSDBG_OP_FAILURE, "Unable to get sized name [%d]: %s\n",
ret, sss_strerror(ret));
diff --git a/src/responder/nss/nss_utils.c b/src/responder/nss/nss_utils.c
index f839930a2..2cd9c33b4 100644
--- a/src/responder/nss/nss_utils.c
+++ b/src/responder/nss/nss_utils.c
@@ -53,93 +53,6 @@ nss_get_name_from_msg(struct sss_domain_info *domain,
return ldb_msg_find_attr_as_string(msg, SYSDB_NAME, NULL);
}
-int sized_output_name(TALLOC_CTX *mem_ctx,
- struct resp_ctx *rctx,
- const char *orig_name,
- struct sss_domain_info *name_dom,
- struct sized_string **_name)
-{
- TALLOC_CTX *tmp_ctx = NULL;
- errno_t ret;
- char *username;
- struct sized_string *name;
-
- tmp_ctx = talloc_new(NULL);
- if (tmp_ctx == NULL) {
- return ENOMEM;
- }
-
- username = sss_output_name(tmp_ctx, orig_name, name_dom->case_preserve,
- rctx->override_space);
- if (username == NULL) {
- ret = EIO;
- goto done;
- }
-
- if (name_dom->fqnames) {
- username = sss_tc_fqname(tmp_ctx, name_dom->names, name_dom, username);
- if (username == NULL) {
- DEBUG(SSSDBG_CRIT_FAILURE, "sss_replace_space failed\n");
- ret = EIO;
- goto done;
- }
- }
-
- name = talloc_zero(tmp_ctx, struct sized_string);
- if (name == NULL) {
- ret = ENOMEM;
- goto done;
- }
-
- to_sized_string(name, username);
- name->str = talloc_steal(name, username);
- *_name = talloc_steal(mem_ctx, name);
- ret = EOK;
-done:
- talloc_zfree(tmp_ctx);
- return ret;
-}
-
-int sized_member_name(TALLOC_CTX *mem_ctx,
- struct resp_ctx *rctx,
- const char *member_name,
- struct sized_string **_name)
-{
- TALLOC_CTX *tmp_ctx = NULL;
- errno_t ret;
- char *domname;
- struct sss_domain_info *member_dom;
-
- tmp_ctx = talloc_new(NULL);
- if (tmp_ctx == NULL) {
- return ENOMEM;
- }
-
- ret = sss_parse_internal_fqname(tmp_ctx, member_name, NULL, &domname);
- if (ret != EOK) {
- DEBUG(SSSDBG_CRIT_FAILURE, "sss_parse_internal_fqname failed\n");
- goto done;
- }
-
- if (domname == NULL) {
- ret = ERR_WRONG_NAME_FORMAT;
- goto done;
- }
-
- member_dom = find_domain_by_name(get_domains_head(rctx->domains),
- domname, true);
- if (member_dom == NULL) {
- ret = ERR_DOMAIN_NOT_FOUND;
- goto done;
- }
-
- ret = sized_output_name(mem_ctx, rctx, member_name,
- member_dom, _name);
-done:
- talloc_free(tmp_ctx);
- return ret;
-}
-
const char *
nss_get_pwfield(struct nss_ctx *nctx,
struct sss_domain_info *dom)