diff options
author | Jakub Hrozek <jhrozek@redhat.com> | 2011-12-12 16:35:22 +0100 |
---|---|---|
committer | Stephen Gallagher <sgallagh@redhat.com> | 2011-12-16 14:46:16 -0500 |
commit | b3b42c49656e192787a983aaa8b9ec744ba4cb9d (patch) | |
tree | c0fd6415e043835c499ecf0bf0322ab4cb187e0d /src/responder/nss | |
parent | df5adbad4f5e938a000aee6527628ad63a0bd4c3 (diff) | |
download | sssd-b3b42c49656e192787a983aaa8b9ec744ba4cb9d.tar.gz sssd-b3b42c49656e192787a983aaa8b9ec744ba4cb9d.tar.bz2 sssd-b3b42c49656e192787a983aaa8b9ec744ba4cb9d.zip |
Use the case sensitivity flag in responders
Diffstat (limited to 'src/responder/nss')
-rw-r--r-- | src/responder/nss/nsssrv_cmd.c | 39 | ||||
-rw-r--r-- | src/responder/nss/nsssrv_netgroup.c | 21 |
2 files changed, 40 insertions, 20 deletions
diff --git a/src/responder/nss/nsssrv_cmd.c b/src/responder/nss/nsssrv_cmd.c index f0270acd..d8eb8b21 100644 --- a/src/responder/nss/nsssrv_cmd.c +++ b/src/responder/nss/nsssrv_cmd.c @@ -394,7 +394,7 @@ static int fill_pwent(struct sss_packet *packet, if (filter_users) { ncret = sss_ncache_check_user(nctx->ncache, nctx->neg_timeout, - domain, name); + dom, name); if (ncret == EEXIST) { DEBUG(4, ("User [%s@%s] filtered out! (negative cache)\n", name, domain)); @@ -715,7 +715,7 @@ static int nss_cmd_getpwnam_search(struct nss_dom_ctx *dctx) struct nss_cmd_ctx *cmdctx = dctx->cmdctx; struct sss_domain_info *dom = dctx->domain; struct cli_ctx *cctx = cmdctx->cctx; - const char *name = cmdctx->name; + char *name = NULL; struct sysdb_ctx *sysdb; struct nss_ctx *nctx; int ret; @@ -740,10 +740,15 @@ static int nss_cmd_getpwnam_search(struct nss_dom_ctx *dctx) /* make sure to update the dctx if we changed domain */ dctx->domain = dom; + talloc_free(name); + name = dom->case_sensitive ? talloc_strdup(dctx, cmdctx->name) : + sss_tc_utf8_str_tolower(dctx, cmdctx->name); + if (!name) return ENOMEM; + /* verify this user has not yet been negatively cached, * or has been permanently filtered */ ret = sss_ncache_check_user(nctx->ncache, nctx->neg_timeout, - dom->name, name); + dom, name); /* if neg cached, return we didn't find it */ if (ret == EEXIST) { @@ -781,7 +786,7 @@ static int nss_cmd_getpwnam_search(struct nss_dom_ctx *dctx) if (dctx->res->count == 0 && !dctx->check_provider) { /* set negative cache only if not result of cache check */ - ret = sss_ncache_set_user(nctx->ncache, false, dom->name, name); + ret = sss_ncache_set_user(nctx->ncache, false, dom, name); if (ret != EOK) { return ret; } @@ -1788,7 +1793,7 @@ static int fill_grent(struct sss_packet *packet, if (filter_groups) { ret = sss_ncache_check_group(nctx->ncache, - nctx->neg_timeout, domain, name); + nctx->neg_timeout, dom, name); if (ret == EEXIST) { DEBUG(4, ("Group [%s@%s] filtered out! (negative cache)\n", name, domain)); @@ -1866,7 +1871,7 @@ static int fill_grent(struct sss_packet *packet, if (nctx->filter_users_in_groups) { ret = sss_ncache_check_user(nctx->ncache, nctx->neg_timeout, - domain, name); + dom, name); if (ret == EEXIST) { DEBUG(6, ("Group [%s] member [%s@%s] filtered out!" " (negative cache)\n", @@ -2002,7 +2007,7 @@ static int nss_cmd_getgrnam_search(struct nss_dom_ctx *dctx) struct nss_cmd_ctx *cmdctx = dctx->cmdctx; struct sss_domain_info *dom = dctx->domain; struct cli_ctx *cctx = cmdctx->cctx; - const char *name = cmdctx->name; + char *name = NULL; struct sysdb_ctx *sysdb; struct nss_ctx *nctx; int ret; @@ -2027,10 +2032,15 @@ static int nss_cmd_getgrnam_search(struct nss_dom_ctx *dctx) /* make sure to update the dctx if we changed domain */ dctx->domain = dom; + talloc_free(name); + name = dom->case_sensitive ? talloc_strdup(dctx, cmdctx->name) : + sss_tc_utf8_str_tolower(dctx, cmdctx->name); + if (!name) return ENOMEM; + /* verify this group has not yet been negatively cached, * or has been permanently filtered */ ret = sss_ncache_check_group(nctx->ncache, nctx->neg_timeout, - dom->name, name); + dom, name); /* if neg cached, return we didn't find it */ if (ret == EEXIST) { @@ -2068,7 +2078,7 @@ static int nss_cmd_getgrnam_search(struct nss_dom_ctx *dctx) if (dctx->res->count == 0 && !dctx->check_provider) { /* set negative cache only if not result of cache check */ - ret = sss_ncache_set_group(nctx->ncache, false, dom->name, name); + ret = sss_ncache_set_group(nctx->ncache, false, dom, name); if (ret != EOK) { return ret; } @@ -3068,7 +3078,7 @@ static int nss_cmd_initgroups_search(struct nss_dom_ctx *dctx) struct nss_cmd_ctx *cmdctx = dctx->cmdctx; struct sss_domain_info *dom = dctx->domain; struct cli_ctx *cctx = cmdctx->cctx; - const char *name = cmdctx->name; + char *name = NULL; struct sysdb_ctx *sysdb; struct nss_ctx *nctx; int ret; @@ -3093,10 +3103,15 @@ static int nss_cmd_initgroups_search(struct nss_dom_ctx *dctx) /* make sure to update the dctx if we changed domain */ dctx->domain = dom; + talloc_free(name); + name = dom->case_sensitive ? talloc_strdup(dctx, cmdctx->name) : + sss_tc_utf8_str_tolower(dctx, cmdctx->name); + if (!name) return ENOMEM; + /* verify this user has not yet been negatively cached, * or has been permanently filtered */ ret = sss_ncache_check_user(nctx->ncache, nctx->neg_timeout, - dom->name, name); + dom, name); /* if neg cached, return we didn't find it */ if (ret == EEXIST) { @@ -3130,7 +3145,7 @@ static int nss_cmd_initgroups_search(struct nss_dom_ctx *dctx) if (dctx->res->count == 0 && !dctx->check_provider) { /* set negative cache only if not result of cache check */ - ret = sss_ncache_set_user(nctx->ncache, false, dom->name, name); + ret = sss_ncache_set_user(nctx->ncache, false, dom, name); if (ret != EOK) { return ret; } diff --git a/src/responder/nss/nsssrv_netgroup.c b/src/responder/nss/nsssrv_netgroup.c index 09b7fa63..39ba4ff7 100644 --- a/src/responder/nss/nsssrv_netgroup.c +++ b/src/responder/nss/nsssrv_netgroup.c @@ -378,6 +378,7 @@ static errno_t lookup_netgr_step(struct setent_step_ctx *step_ctx) struct sss_domain_info *dom = step_ctx->dctx->domain; struct getent_ctx *netgr; struct sysdb_ctx *sysdb; + char *name = NULL; /* Check each domain for this netgroup name */ while (dom) { @@ -400,8 +401,13 @@ static errno_t lookup_netgr_step(struct setent_step_ctx *step_ctx) /* make sure to update the dctx if we changed domain */ step_ctx->dctx->domain = dom; + talloc_free(name); + name = dom->case_sensitive ? \ + talloc_strdup(step_ctx, step_ctx->name) : + sss_tc_utf8_str_tolower(step_ctx, step_ctx->name); + DEBUG(4, ("Requesting info for [%s@%s]\n", - step_ctx->name, dom->name)); + name, dom->name)); ret = sysdb_get_ctx_from_list(step_ctx->rctx->db_list, dom, &sysdb); if (ret != EOK) { DEBUG(0, ("Fatal: Sysdb CTX not found for this domain!\n")); @@ -409,7 +415,7 @@ static errno_t lookup_netgr_step(struct setent_step_ctx *step_ctx) } /* Look up the netgroup in the cache */ - ret = sysdb_getnetgr(step_ctx->dctx, sysdb, step_ctx->name, + ret = sysdb_getnetgr(step_ctx->dctx, sysdb, name, &step_ctx->dctx->res); if (ret == ENOENT) { /* This netgroup was not found in this domain */ @@ -442,7 +448,7 @@ static errno_t lookup_netgr_step(struct setent_step_ctx *step_ctx) if (ret == ENOENT) { /* This netgroup was not found in this domain */ DEBUG(2, ("No results for netgroup %s (domain %s)\n", - step_ctx->name, dom->name)); + name, dom->name)); if (!step_ctx->dctx->check_provider) { if (step_ctx->check_next) { @@ -469,7 +475,7 @@ static errno_t lookup_netgr_step(struct setent_step_ctx *step_ctx) step_ctx->nctx, step_ctx->dctx->res, SSS_DP_NETGR, - step_ctx->name, 0, + name, 0, lookup_netgr_dp_callback, step_ctx); if (ret != EOK) { @@ -482,7 +488,7 @@ static errno_t lookup_netgr_step(struct setent_step_ctx *step_ctx) /* Results found */ DEBUG(6, ("Returning info for netgroup [%s@%s]\n", - step_ctx->name, dom->name)); + name, dom->name)); netgr->ready = true; netgr->found = true; set_netgr_lifetime(dom->entry_cache_timeout, step_ctx, netgr); @@ -490,8 +496,7 @@ static errno_t lookup_netgr_step(struct setent_step_ctx *step_ctx) } /* If we've gotten here, then no domain contained this netgroup */ - DEBUG(2, ("No matching domain found for [%s], fail!\n", - step_ctx->name)); + DEBUG(2, ("No matching domain found for [%s], fail!\n", name)); netgr = talloc_zero(step_ctx->nctx, struct getent_ctx); if (netgr == NULL) { @@ -501,7 +506,7 @@ static errno_t lookup_netgr_step(struct setent_step_ctx *step_ctx) netgr->found = false; netgr->entries = NULL; netgr->lookup_table = step_ctx->nctx->netgroups; - netgr->name = talloc_strdup(netgr, step_ctx->name); + netgr->name = talloc_strdup(netgr, name); if (netgr->name == NULL) { DEBUG(1, ("talloc_strdup failed.\n")); talloc_free(netgr); |