>From e43896211f70749eb9a61a00558780824fa3976d Mon Sep 17 00:00:00 2001 From: Pavel Reichl Date: Tue, 28 Jan 2014 17:19:07 +0000 Subject: [PATCH 3/6] refactor calls of sss_parse_name sss_parse_name now supports NULL as output parameters so existing calls passing arguments which were never read were substituted by NULL. Reviewed-by: Jakub Hrozek --- src/providers/krb5/krb5_common.c | 3 +-- src/providers/ldap/sdap_access.c | 3 +-- src/responder/nss/nsssrv_cmd.c | 3 +-- src/util/domain_info_utils.c | 3 +-- 4 files changed, 4 insertions(+), 8 deletions(-) diff --git a/src/providers/krb5/krb5_common.c b/src/providers/krb5/krb5_common.c index 48cb6908061347d7fae9d58fe5ce683113cdca7f..4eafe366acf831bc648feb748f94a2b8de02ff59 100644 --- a/src/providers/krb5/krb5_common.c +++ b/src/providers/krb5/krb5_common.c @@ -1005,7 +1005,6 @@ errno_t krb5_get_simple_upn(TALLOC_CTX *mem_ctx, struct krb5_ctx *krb5_ctx, char *uc_dom = NULL; char *upn; char *name; - char *domname; TALLOC_CTX *tmp_ctx = NULL; errno_t ret; @@ -1035,7 +1034,7 @@ errno_t krb5_get_simple_upn(TALLOC_CTX *mem_ctx, struct krb5_ctx *krb5_ctx, /* Subdomains already have a fully qualified name, which contains * the domain name. We need to replace it with the realm name */ - ret = sss_parse_name(tmp_ctx, dom->names, username, &domname, &name); + ret = sss_parse_name(tmp_ctx, dom->names, username, NULL, &name); if (ret != EOK) { DEBUG(SSSDBG_OP_FAILURE, "Could not parse [%s] into name and " diff --git a/src/providers/ldap/sdap_access.c b/src/providers/ldap/sdap_access.c index db0e878d86f32e5eb6f30d1c99e21ed999733051..4e17090281309f3ba41651566d043bcf842d530b 100644 --- a/src/providers/ldap/sdap_access.c +++ b/src/providers/ldap/sdap_access.c @@ -666,7 +666,6 @@ static struct tevent_req *sdap_access_filter_send(TALLOC_CTX *mem_ctx, char *clean_username; errno_t ret = ERR_INTERNAL; char *name; - char *domname; req = tevent_req_create(mem_ctx, &state, struct sdap_access_filter_req_ctx); if (req == NULL) { @@ -720,7 +719,7 @@ static struct tevent_req *sdap_access_filter_send(TALLOC_CTX *mem_ctx, /* Construct the filter */ /* Subdomain users are identified by FQDN. We need to use just the username */ - ret = sss_parse_name(state, domain->names, username, &domname, &name); + ret = sss_parse_name(state, domain->names, username, NULL, &name); if (ret != EOK) { DEBUG(SSSDBG_OP_FAILURE, "Could not parse [%s] into name and " diff --git a/src/responder/nss/nsssrv_cmd.c b/src/responder/nss/nsssrv_cmd.c index d273d8040affb35b3608106f12ba5f620902d428..59f2c577915b45ec089eb92f08ddeeaf4cb714d7 100644 --- a/src/responder/nss/nsssrv_cmd.c +++ b/src/responder/nss/nsssrv_cmd.c @@ -177,13 +177,12 @@ static const char *get_homedir_override(TALLOC_CTX *mem_ctx, { const char *homedir; char *name; - char *domname; errno_t ret; homedir = ldb_msg_find_attr_as_string(msg, SYSDB_HOMEDIR, NULL); /* Subdomain users store FQDN in their name attribute */ - ret = sss_parse_name(mem_ctx, dom->names, orig_name, &domname, &name); + ret = sss_parse_name(mem_ctx, dom->names, orig_name, NULL, &name); if (ret != EOK) { DEBUG(SSSDBG_MINOR_FAILURE, "Could not parse [%s] into " "name-value components.\n", orig_name); diff --git a/src/util/domain_info_utils.c b/src/util/domain_info_utils.c index 472011c73bf3478da79ff02b54d35f0119c33018..bd45a11cdb30fb7dcc3decb2d8020a19b56efcc7 100644 --- a/src/util/domain_info_utils.c +++ b/src/util/domain_info_utils.c @@ -156,7 +156,6 @@ find_subdomain_by_object_name(struct sss_domain_info *domain, TALLOC_CTX *tmp_ctx; struct sss_domain_info *dom = NULL; char *domainname = NULL; - char *name = NULL; errno_t ret; tmp_ctx = talloc_new(NULL); @@ -166,7 +165,7 @@ find_subdomain_by_object_name(struct sss_domain_info *domain, } ret = sss_parse_name(tmp_ctx, domain->names, object_name, - &domainname, &name); + &domainname, NULL); if (ret != EOK) { DEBUG(SSSDBG_CRIT_FAILURE, "Unable to parse name '%s' [%d]: %s\n", object_name, ret, sss_strerror(ret)); -- 1.9.3