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>
(cherry picked from commit f3a5ac1a50c1fccd0801023658e42d2093e1a33a)

8 files changed, 59 insertions, 32 deletions

diff --git a/src/confdb/confdb.h b/src/confdb/confdb.h
index 2bee9c82c..10ec13bf7 100644
--- a/src/confdb/confdb.h
+++ b/src/confdb/confdb.h
@@ -67,6 +67,7 @@
 #define CONFDB_MONITOR_TRY_INOTIFY "try_inotify"
 #define CONFDB_MONITOR_KRB5_RCACHEDIR "krb5_rcache_dir"
 #define CONFDB_MONITOR_DEFAULT_DOMAIN "default_domain_suffix"
+#define CONFDB_MONITOR_OVERRIDE_SPACE "override_space"
 
 /* Both monitor and domains */
 #define CONFDB_NAME_REGEX   "re_expression"
@@ -98,7 +99,6 @@
 #define CONFDB_MEMCACHE_TIMEOUT "memcache_timeout"
 #define CONFDB_NSS_HOMEDIR_SUBSTRING "homedir_substring"
 #define CONFDB_DEFAULT_HOMEDIR_SUBSTRING "/home"
-#define CONFDB_NSS_OVERRIDE_SPACE "override_space"
 
 /* PAM */
 #define CONFDB_PAM_CONF_ENTRY "config/pam"
diff --git a/src/man/sssd.conf.5.xml b/src/man/sssd.conf.5.xml
index 9f6ec69f3..791c38e46 100644
--- a/src/man/sssd.conf.5.xml
+++ b/src/man/sssd.conf.5.xml
@@ -258,6 +258,29 @@
                             </para>
                         </listitem>
                     </varlistentry>
+                    <varlistentry>
+                        <term>override_space (string)</term>
+                        <listitem>
+                            <para>
+                                This parameter will replace spaces (space bar)
+                                with the given character for user and group names.
+                                e.g. (_). User name &quot;john doe&quot; will
+                                be &quot;john_doe&quot; This feature was added to
+                                help compatibility with shell scripts that have
+                                difficulty handling spaces, due to the
+                                default field separator in the shell.
+                            </para>
+                            <para>
+                                Please note it is a configuration error to use
+                                a replacement character that might be used by
+                                another LDAP object. In that case, result of
+                                a lookup is undefined.
+                            </para>
+                            <para>
+                                Default: not set (spaces will not be replaced)
+                            </para>
+                        </listitem>
+                    </varlistentry>
                 </variablelist>
             </para>
         </refsect2>
@@ -607,23 +630,6 @@ fallback_homedir = /home/%u
                         </para>
                     </listitem>
                 </varlistentry>
-                <varlistentry>
-                    <term>override_space (string)</term>
-                    <listitem>
-                        <para>
-                            This parameter will replace spaces (space bar)
-                            with the given character for user and group names.
-                            e.g. (_). User name &quot;john doe&quot; will
-                            be &quot;john_doe&quot; This feature was added to
-                            help compatibility with shell scripts that have
-                            difficulty handling spaces, due to the
-                            default field separator in the shell.
-                        </para>
-                        <para>
-                            Default: not set (spaces will not be replaced)
-                        </para>
-                    </listitem>
-                </varlistentry>
             </variablelist>
         </refsect2>
         <refsect2 id='PAM'>
diff --git a/src/responder/common/responder.h b/src/responder/common/responder.h
index c2440b132..8c7ad4fad 100644
--- a/src/responder/common/responder.h
+++ b/src/responder/common/responder.h
@@ -100,6 +100,7 @@ struct resp_ctx {
     uid_t *allowed_uids;
 
     char *default_domain;
+    char override_space;
 
     void *pvt_ctx;
 
diff --git a/src/responder/common/responder_common.c b/src/responder/common/responder_common.c
index 2dd62ffcd..b51175bcc 100644
--- a/src/responder/common/responder_common.c
+++ b/src/responder/common/responder_common.c
@@ -780,6 +780,7 @@ int sss_process_init(TALLOC_CTX *mem_ctx,
     struct resp_ctx *rctx;
     struct sss_domain_info *dom;
     int ret;
+    char *tmp = NULL;
 
     rctx = talloc_zero(mem_ctx, struct resp_ctx);
     if (!rctx) {
@@ -843,6 +844,26 @@ int sss_process_init(TALLOC_CTX *mem_ctx,
         goto fail;
     }
 
+    ret = confdb_get_string(rctx->cdb, rctx, CONFDB_MONITOR_CONF_ENTRY,
+                            CONFDB_MONITOR_OVERRIDE_SPACE, NULL,
+                            &tmp);
+    if (ret != EOK) {
+        DEBUG(SSSDBG_OP_FAILURE,
+              "Cannnot get the space substitution character [%d]: %s\n",
+               ret, strerror(ret));
+        goto fail;
+    }
+
+    if (tmp != NULL) {
+        if (strlen(tmp) > 1) {
+            DEBUG(SSSDBG_MINOR_FAILURE, "Option %s is longer than 1 character "
+                  "only the first character %c will be used\n",
+                  CONFDB_MONITOR_OVERRIDE_SPACE, tmp[0]);
+        }
+
+        rctx->override_space = tmp[0];
+    }
+
     ret = sss_monitor_init(rctx, rctx->ev, monitor_intf,
                            svc_name, svc_version, rctx,
                            &rctx->mon_conn);
diff --git a/src/responder/nss/nsssrv.c b/src/responder/nss/nsssrv.c
index 5f58bf640..dba412a64 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 83eed37bf..0f0a75a8f 100644
--- a/src/responder/nss/nsssrv.h
+++ b/src/responder/nss/nsssrv.h
@@ -67,7 +67,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 fa6536de1..2745c27d1 100644
--- a/src/responder/nss/nsssrv_cmd.c
+++ b/src/responder/nss/nsssrv_cmd.c
@@ -378,7 +378,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");
@@ -766,7 +767,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");
@@ -2314,7 +2315,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");
@@ -2497,7 +2499,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");
@@ -2707,7 +2710,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");
@@ -3741,7 +3745,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");
@@ -3909,7 +3914,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");
diff --git a/src/tests/cmocka/test_nss_srv.c b/src/tests/cmocka/test_nss_srv.c
index d93b1872a..a642f9a93 100644
--- a/src/tests/cmocka/test_nss_srv.c
+++ b/src/tests/cmocka/test_nss_srv.c
@@ -71,7 +71,6 @@ mock_nctx(TALLOC_CTX *mem_ctx)
     }
     nctx->neg_timeout = 10;
     nctx->pwfield = discard_const("*");
-    nctx->override_space = discard_const("\0");
 
     return nctx;
 }
@@ -603,6 +602,7 @@ void test_nss_setup(struct sss_test_conf_param params[],
     nss_test_ctx->rctx = mock_rctx(nss_test_ctx, nss_test_ctx->tctx->ev,
                                    nss_test_ctx->tctx->dom, nss_test_ctx->nctx);
     assert_non_null(nss_test_ctx->rctx);
+    nss_test_ctx->nctx->rctx = nss_test_ctx->rctx;
 
     /* Create client context */
     nss_test_ctx->cctx = mock_cctx(nss_test_ctx, nss_test_ctx->rctx);