diff options
author | Jakub Hrozek <jhrozek@redhat.com> | 2014-08-10 18:59:40 +0200 |
---|---|---|
committer | Jakub Hrozek <jhrozek@redhat.com> | 2014-08-13 15:10:30 +0200 |
commit | f3a5ac1a50c1fccd0801023658e42d2093e1a33a (patch) | |
tree | 273ce39f9b428016f18ff123f546c3c81c560f89 /src/responder/nss | |
parent | 1f3127e88a87953f059c9a70d3582ae1719594b1 (diff) | |
download | sssd-f3a5ac1a50c1fccd0801023658e42d2093e1a33a.tar.gz sssd-f3a5ac1a50c1fccd0801023658e42d2093e1a33a.tar.xz sssd-f3a5ac1a50c1fccd0801023658e42d2093e1a33a.zip |
Make the space override responder-agnostic
https://fedorahosted.org/sssd/ticket/2397
In order to make the override_space option usable by other responders,
we need to move the override_space option to the generic responder
structure.
Reviewed-by: Pavel Březina <pbrezina@redhat.com>
Reviewed-by: Lukáš Slebodník <lslebodn@redhat.com>
Diffstat (limited to 'src/responder/nss')
-rw-r--r-- | src/responder/nss/nsssrv.c | 5 | ||||
-rw-r--r-- | src/responder/nss/nsssrv.h | 1 | ||||
-rw-r--r-- | src/responder/nss/nsssrv_cmd.c | 19 |
3 files changed, 12 insertions, 13 deletions
diff --git a/src/responder/nss/nsssrv.c b/src/responder/nss/nsssrv.c index 9705878fa..84a6b7fed 100644 --- a/src/responder/nss/nsssrv.c +++ b/src/responder/nss/nsssrv.c @@ -298,11 +298,6 @@ static int nss_get_config(struct nss_ctx *nctx, &nctx->homedir_substr); if (ret != EOK) goto done; - ret = confdb_get_string(cdb, nctx, CONFDB_NSS_CONF_ENTRY, - CONFDB_NSS_OVERRIDE_SPACE, NULL, - &nctx->override_space); - if (ret != EOK) goto done; - ret = 0; done: return ret; diff --git a/src/responder/nss/nsssrv.h b/src/responder/nss/nsssrv.h index f5238fb82..a5b946b7e 100644 --- a/src/responder/nss/nsssrv.h +++ b/src/responder/nss/nsssrv.h @@ -69,7 +69,6 @@ struct nss_ctx { char **etc_shells; char *shell_fallback; char *default_shell; - char *override_space; struct sss_mc_ctx *pwd_mc_ctx; struct sss_mc_ctx *grp_mc_ctx; diff --git a/src/responder/nss/nsssrv_cmd.c b/src/responder/nss/nsssrv_cmd.c index 10e84e52c..91139980a 100644 --- a/src/responder/nss/nsssrv_cmd.c +++ b/src/responder/nss/nsssrv_cmd.c @@ -372,7 +372,8 @@ static int fill_pwent(struct sss_packet *packet, continue; } - tmpstr = sss_replace_space(tmp_ctx, tmpstr, nctx->override_space[0]); + tmpstr = sss_replace_space(tmp_ctx, tmpstr, + nctx->rctx->override_space); if (tmpstr == NULL) { DEBUG(SSSDBG_CRIT_FAILURE, "sss_replace_space failed, skipping\n"); @@ -752,7 +753,7 @@ static int nss_cmd_getpwnam_search(struct nss_dom_ctx *dctx) if (!name) return ENOMEM; name = sss_reverse_replace_space(dctx, name, - nctx->override_space[0]); + nctx->rctx->override_space); if (name == NULL) { DEBUG(SSSDBG_CRIT_FAILURE, "sss_reverse_replace_space failed\n"); @@ -2360,7 +2361,8 @@ static int fill_members(struct sss_packet *packet, continue; } - tmpstr = sss_replace_space(tmp_ctx, tmpstr, nctx->override_space[0]); + tmpstr = sss_replace_space(tmp_ctx, tmpstr, + nctx->rctx->override_space); if (tmpstr == NULL) { DEBUG(SSSDBG_CRIT_FAILURE, "sss_replace_space failed\n"); @@ -2523,7 +2525,8 @@ static int fill_grent(struct sss_packet *packet, continue; } - tmpstr = sss_replace_space(tmp_ctx, tmpstr, nctx->override_space[0]); + tmpstr = sss_replace_space(tmp_ctx, tmpstr, + nctx->rctx->override_space); if (tmpstr == NULL) { DEBUG(SSSDBG_CRIT_FAILURE, "sss_replace_space failed, skipping\n"); @@ -2724,7 +2727,8 @@ static int nss_cmd_getgrnam_search(struct nss_dom_ctx *dctx) name = sss_get_cased_name(dctx, cmdctx->name, dom->case_sensitive); if (!name) return ENOMEM; - name = sss_reverse_replace_space(dctx, name, nctx->override_space[0]); + name = sss_reverse_replace_space(dctx, name, + nctx->rctx->override_space); if (name == NULL) { DEBUG(SSSDBG_CRIT_FAILURE, "sss_reverse_replace_space failed\n"); @@ -3754,7 +3758,8 @@ static int nss_cmd_initgroups_search(struct nss_dom_ctx *dctx) name = sss_get_cased_name(dctx, cmdctx->name, dom->case_sensitive); if (!name) return ENOMEM; - name = sss_reverse_replace_space(dctx, name, nctx->override_space[0]); + name = sss_reverse_replace_space(dctx, name, + nctx->rctx->override_space); if (name == NULL) { DEBUG(SSSDBG_CRIT_FAILURE, "sss_reverse_replace_space failed\n"); @@ -3921,7 +3926,7 @@ static errno_t nss_cmd_getsidby_search(struct nss_dom_ctx *dctx) } name = sss_reverse_replace_space(dctx, name, - nctx->override_space[0]); + nctx->rctx->override_space); if (name == NULL) { DEBUG(SSSDBG_CRIT_FAILURE, "sss_reverse_replace_space failed\n"); |