Only replace space with the specified substitution

https://fedorahosted.org/sssd/ticket/2397

- make sss_replace_whitespaces only replace space (' ') not any
  whitespace
- make sss_replace_whitespaces only replace a single char, not the whole
  string
- rename CONFDB_NSS_OVERRIDE_DEFAULT_WHITESPACE to
  CONFDB_NSS_OVERRIDE_DEFAULT_SPACE
- rename the override_default_whitespace option to override_space
- rename sss_replace_whitespaces() to sss_replace_space()
- rename sss_reverse_replace_whitespaces() to sss_reverse_replace_space()
- rename nctx->override_default_wsp_str to nctx->override_space
- make the return value of sss_replace_space non-const to avoid freeing
  the result without compilation warnings

Reviewed-by: Pavel Březina <pbrezina@redhat.com>
Reviewed-by: Lukáš Slebodník <lslebodn@redhat.com>

1 files changed, 16 insertions, 21 deletions

diff --git a/src/responder/nss/nsssrv_cmd.c b/src/responder/nss/nsssrv_cmd.c
index 3e1b470e5..10e84e52c 100644
--- a/src/responder/nss/nsssrv_cmd.c
+++ b/src/responder/nss/nsssrv_cmd.c
@@ -372,11 +372,10 @@ static int fill_pwent(struct sss_packet *packet,
             continue;
         }
 
-        tmpstr = sss_replace_whitespaces(tmp_ctx, tmpstr,
-                                         nctx->override_default_wsp_str);
+        tmpstr = sss_replace_space(tmp_ctx, tmpstr, nctx->override_space[0]);
         if (tmpstr == NULL) {
             DEBUG(SSSDBG_CRIT_FAILURE,
-                  "sss_replace_whitespaces failed, skipping\n");
+                  "sss_replace_space failed, skipping\n");
             continue;
         }
 
@@ -752,11 +751,11 @@ static int nss_cmd_getpwnam_search(struct nss_dom_ctx *dctx)
         name = sss_get_cased_name(cmdctx, cmdctx->name, dom->case_sensitive);
         if (!name) return ENOMEM;
 
-        name = sss_reverse_replace_whitespaces(dctx, name,
-                                               nctx->override_default_wsp_str);
+        name = sss_reverse_replace_space(dctx, name,
+                                         nctx->override_space[0]);
         if (name == NULL) {
             DEBUG(SSSDBG_CRIT_FAILURE,
-                  "sss_reverse_replace_whitespaces failed\n");
+                  "sss_reverse_replace_space failed\n");
             return ENOMEM;
         }
 
@@ -2361,11 +2360,10 @@ static int fill_members(struct sss_packet *packet,
             continue;
         }
 
-        tmpstr = sss_replace_whitespaces(tmp_ctx, tmpstr,
-                                         nctx->override_default_wsp_str);
+        tmpstr = sss_replace_space(tmp_ctx, tmpstr, nctx->override_space[0]);
         if (tmpstr == NULL) {
             DEBUG(SSSDBG_CRIT_FAILURE,
-                  "sss_replace_whitespaces failed\n");
+                  "sss_replace_space failed\n");
             ret = ENOMEM;
             goto done;
         }
@@ -2525,11 +2523,10 @@ static int fill_grent(struct sss_packet *packet,
             continue;
         }
 
-        tmpstr = sss_replace_whitespaces(tmp_ctx, tmpstr,
-                                         nctx->override_default_wsp_str);
+        tmpstr = sss_replace_space(tmp_ctx, tmpstr, nctx->override_space[0]);
         if (tmpstr == NULL) {
             DEBUG(SSSDBG_CRIT_FAILURE,
-                  "sss_replace_whitespaces failed, skipping\n");
+                  "sss_replace_space failed, skipping\n");
             continue;
         }
 
@@ -2727,11 +2724,10 @@ 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_whitespaces(dctx, name,
-                                               nctx->override_default_wsp_str);
+        name = sss_reverse_replace_space(dctx, name, nctx->override_space[0]);
         if (name == NULL) {
             DEBUG(SSSDBG_CRIT_FAILURE,
-                  "sss_reverse_replace_whitespaces failed\n");
+                  "sss_reverse_replace_space failed\n");
             return ENOMEM;
         }
 
@@ -3758,11 +3754,10 @@ 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_whitespaces(dctx, name,
-                                               nctx->override_default_wsp_str);
+        name = sss_reverse_replace_space(dctx, name, nctx->override_space[0]);
         if (name == NULL) {
             DEBUG(SSSDBG_CRIT_FAILURE,
-                  "sss_reverse_replace_whitespaces failed\n");
+                  "sss_reverse_replace_space failed\n");
             return ENOMEM;
         }
 
@@ -3925,11 +3920,11 @@ static errno_t nss_cmd_getsidby_search(struct nss_dom_ctx *dctx)
                 goto done;
             }
 
-            name = sss_reverse_replace_whitespaces(dctx, name,
-                                               nctx->override_default_wsp_str);
+            name = sss_reverse_replace_space(dctx, name,
+                                             nctx->override_space[0]);
             if (name == NULL) {
                 DEBUG(SSSDBG_CRIT_FAILURE,
-                      "sss_reverse_replace_whitespaces failed\n");
+                      "sss_reverse_replace_space failed\n");
                 ret = ENOMEM;
                 goto done;
             }