Blame SOURCES/0103-Move-sized_output_name-and-sized_domain_name-into-re.patch

ecf709
From 84be2901aeb36ac60760cc11c424b717df360e87 Mon Sep 17 00:00:00 2001
ecf709
From: Jakub Hrozek <jhrozek@redhat.com>
ecf709
Date: Wed, 19 Apr 2017 17:44:40 +0200
ecf709
Subject: [PATCH 103/104] Move sized_output_name() and sized_domain_name() into
ecf709
 responder common code
ecf709
MIME-Version: 1.0
ecf709
Content-Type: text/plain; charset=UTF-8
ecf709
Content-Transfer-Encoding: 8bit
ecf709
ecf709
These functions are used to format a name into a format that the user
ecf709
configured for output, including case sensitiveness, replacing
ecf709
whitespace and qualified format. They were used only in the NSS
ecf709
responder, which typically returns strings to the NSS client library and
ecf709
then the user.
ecf709
ecf709
But it makes sense to just reuse the same code in the IFP responder as
ecf709
well, since it does essentially the same job.
ecf709
ecf709
The patch also renames sized_member_name to sized_domain_name.
ecf709
Previously, the function was only used to format a group member, the IFP
ecf709
responder would use the same function to format a group the user is a
ecf709
member of.
ecf709
ecf709
Related to:
ecf709
    https://pagure.io/SSSD/sssd/issue/3268
ecf709
ecf709
Reviewed-by: Pavel Březina <pbrezina@redhat.com>
ecf709
(cherry picked from commit 7c074ba2f923985ab0d4f9d6a5e01ff3f2f0a7a8)
ecf709
---
ecf709
 src/responder/common/responder.h        | 21 ++++++++
ecf709
 src/responder/common/responder_common.c | 90 +++++++++++++++++++++++++++++++++
ecf709
 src/responder/nss/nss_private.h         | 11 ----
ecf709
 src/responder/nss/nss_protocol_grent.c  |  2 +-
ecf709
 src/responder/nss/nss_utils.c           | 87 -------------------------------
ecf709
 5 files changed, 112 insertions(+), 99 deletions(-)
ecf709
ecf709
diff --git a/src/responder/common/responder.h b/src/responder/common/responder.h
ecf709
index 4210307489fe25829a1674f254ecc7d185029698..dfe1ec455e355de263c3550306e53fea3ada85df 100644
ecf709
--- a/src/responder/common/responder.h
ecf709
+++ b/src/responder/common/responder.h
ecf709
@@ -393,4 +393,25 @@ char *sss_resp_create_fqname(TALLOC_CTX *mem_ctx,
ecf709
 
ecf709
 errno_t sss_resp_populate_cr_domains(struct resp_ctx *rctx);
ecf709
 
ecf709
+/**
ecf709
+ * Helper functions to format output names
ecf709
+ */
ecf709
+
ecf709
+/* Format orig_name into a sized_string in output format as prescribed
ecf709
+ * by the name_dom domain
ecf709
+ */
ecf709
+int sized_output_name(TALLOC_CTX *mem_ctx,
ecf709
+                      struct resp_ctx *rctx,
ecf709
+                      const char *orig_name,
ecf709
+                      struct sss_domain_info *name_dom,
ecf709
+                      struct sized_string **_name);
ecf709
+
ecf709
+/* Format orig_name into a sized_string in output format as prescribed
ecf709
+ * by the domain read from the fully qualified name.
ecf709
+ */
ecf709
+int sized_domain_name(TALLOC_CTX *mem_ctx,
ecf709
+                      struct resp_ctx *rctx,
ecf709
+                      const char *member_name,
ecf709
+                      struct sized_string **_name);
ecf709
+
ecf709
 #endif /* __SSS_RESPONDER_H__ */
ecf709
diff --git a/src/responder/common/responder_common.c b/src/responder/common/responder_common.c
ecf709
index 67e1deefdfde19c95a68029b11099579d851513f..ac6320b08de09bc6c7e8dd1af72e0a493a449f7a 100644
ecf709
--- a/src/responder/common/responder_common.c
ecf709
+++ b/src/responder/common/responder_common.c
ecf709
@@ -1651,3 +1651,93 @@ done:
ecf709
 
ecf709
     return ret;
ecf709
 }
ecf709
+
ecf709
+/**
ecf709
+ * Helper functions to format output names
ecf709
+ */
ecf709
+int sized_output_name(TALLOC_CTX *mem_ctx,
ecf709
+                      struct resp_ctx *rctx,
ecf709
+                      const char *orig_name,
ecf709
+                      struct sss_domain_info *name_dom,
ecf709
+                      struct sized_string **_name)
ecf709
+{
ecf709
+    TALLOC_CTX *tmp_ctx = NULL;
ecf709
+    errno_t ret;
ecf709
+    char *username;
ecf709
+    struct sized_string *name;
ecf709
+
ecf709
+    tmp_ctx = talloc_new(NULL);
ecf709
+    if (tmp_ctx == NULL) {
ecf709
+        return ENOMEM;
ecf709
+    }
ecf709
+
ecf709
+    username = sss_output_name(tmp_ctx, orig_name, name_dom->case_preserve,
ecf709
+                               rctx->override_space);
ecf709
+    if (username == NULL) {
ecf709
+        ret = EIO;
ecf709
+        goto done;
ecf709
+    }
ecf709
+
ecf709
+    if (name_dom->fqnames) {
ecf709
+        username = sss_tc_fqname(tmp_ctx, name_dom->names, name_dom, username);
ecf709
+        if (username == NULL) {
ecf709
+            DEBUG(SSSDBG_CRIT_FAILURE, "sss_replace_space failed\n");
ecf709
+            ret = EIO;
ecf709
+            goto done;
ecf709
+        }
ecf709
+    }
ecf709
+
ecf709
+    name = talloc_zero(tmp_ctx, struct sized_string);
ecf709
+    if (name == NULL) {
ecf709
+        ret = ENOMEM;
ecf709
+        goto done;
ecf709
+    }
ecf709
+
ecf709
+    to_sized_string(name, username);
ecf709
+    name->str = talloc_steal(name, username);
ecf709
+    *_name = talloc_steal(mem_ctx, name);
ecf709
+    ret = EOK;
ecf709
+done:
ecf709
+    talloc_zfree(tmp_ctx);
ecf709
+    return ret;
ecf709
+}
ecf709
+
ecf709
+int sized_domain_name(TALLOC_CTX *mem_ctx,
ecf709
+                      struct resp_ctx *rctx,
ecf709
+                      const char *member_name,
ecf709
+                      struct sized_string **_name)
ecf709
+{
ecf709
+    TALLOC_CTX *tmp_ctx = NULL;
ecf709
+    errno_t ret;
ecf709
+    char *domname;
ecf709
+    struct sss_domain_info *member_dom;
ecf709
+
ecf709
+    tmp_ctx = talloc_new(NULL);
ecf709
+    if (tmp_ctx == NULL) {
ecf709
+        return ENOMEM;
ecf709
+    }
ecf709
+
ecf709
+    ret = sss_parse_internal_fqname(tmp_ctx, member_name, NULL, &domname);
ecf709
+    if (ret != EOK) {
ecf709
+        DEBUG(SSSDBG_CRIT_FAILURE, "sss_parse_internal_fqname failed\n");
ecf709
+        goto done;
ecf709
+    }
ecf709
+
ecf709
+    if (domname == NULL) {
ecf709
+        ret = ERR_WRONG_NAME_FORMAT;
ecf709
+        goto done;
ecf709
+    }
ecf709
+
ecf709
+    member_dom = find_domain_by_name(get_domains_head(rctx->domains),
ecf709
+                                     domname, true);
ecf709
+    if (member_dom == NULL) {
ecf709
+        ret = ERR_DOMAIN_NOT_FOUND;
ecf709
+        goto done;
ecf709
+    }
ecf709
+
ecf709
+    ret = sized_output_name(mem_ctx, rctx, member_name,
ecf709
+                            member_dom, _name);
ecf709
+done:
ecf709
+    talloc_free(tmp_ctx);
ecf709
+    return ret;
ecf709
+}
ecf709
diff --git a/src/responder/nss/nss_private.h b/src/responder/nss/nss_private.h
ecf709
index acb3c4aa504e538ca56dca8d43ee04b0f60954a9..13de83226177bbaa8b8237e3e27b7e72da369194 100644
ecf709
--- a/src/responder/nss/nss_private.h
ecf709
+++ b/src/responder/nss/nss_private.h
ecf709
@@ -140,17 +140,6 @@ const char *
ecf709
 nss_get_name_from_msg(struct sss_domain_info *domain,
ecf709
                       struct ldb_message *msg);
ecf709
 
ecf709
-int sized_output_name(TALLOC_CTX *mem_ctx,
ecf709
-                      struct resp_ctx *rctx,
ecf709
-                      const char *orig_name,
ecf709
-                      struct sss_domain_info *name_dom,
ecf709
-                      struct sized_string **_name);
ecf709
-
ecf709
-int sized_member_name(TALLOC_CTX *mem_ctx,
ecf709
-                      struct resp_ctx *rctx,
ecf709
-                      const char *member_name,
ecf709
-                      struct sized_string **_name);
ecf709
-
ecf709
 const char *
ecf709
 nss_get_pwfield(struct nss_ctx *nctx,
ecf709
                 struct sss_domain_info *dom);
ecf709
diff --git a/src/responder/nss/nss_protocol_grent.c b/src/responder/nss/nss_protocol_grent.c
ecf709
index 283ab9f6731bc4c8261ca79075ab030005bf70db..fae1d47d7b217beafba75740e2e6d9cb8cdbc1d0 100644
ecf709
--- a/src/responder/nss/nss_protocol_grent.c
ecf709
+++ b/src/responder/nss/nss_protocol_grent.c
ecf709
@@ -163,7 +163,7 @@ nss_protocol_fill_members(struct sss_packet *packet,
ecf709
                 }
ecf709
             }
ecf709
 
ecf709
-            ret = sized_member_name(tmp_ctx, rctx, member_name, &name);
ecf709
+            ret = sized_domain_name(tmp_ctx, rctx, member_name, &name);
ecf709
             if (ret != EOK) {
ecf709
                 DEBUG(SSSDBG_OP_FAILURE, "Unable to get sized name [%d]: %s\n",
ecf709
                       ret, sss_strerror(ret));
ecf709
diff --git a/src/responder/nss/nss_utils.c b/src/responder/nss/nss_utils.c
ecf709
index f839930a275db56e8d729888af870562d7b6f260..2cd9c33b42f7e018ea89d2df206637f35646489e 100644
ecf709
--- a/src/responder/nss/nss_utils.c
ecf709
+++ b/src/responder/nss/nss_utils.c
ecf709
@@ -53,93 +53,6 @@ nss_get_name_from_msg(struct sss_domain_info *domain,
ecf709
     return ldb_msg_find_attr_as_string(msg, SYSDB_NAME, NULL);
ecf709
 }
ecf709
 
ecf709
-int sized_output_name(TALLOC_CTX *mem_ctx,
ecf709
-                      struct resp_ctx *rctx,
ecf709
-                      const char *orig_name,
ecf709
-                      struct sss_domain_info *name_dom,
ecf709
-                      struct sized_string **_name)
ecf709
-{
ecf709
-    TALLOC_CTX *tmp_ctx = NULL;
ecf709
-    errno_t ret;
ecf709
-    char *username;
ecf709
-    struct sized_string *name;
ecf709
-
ecf709
-    tmp_ctx = talloc_new(NULL);
ecf709
-    if (tmp_ctx == NULL) {
ecf709
-        return ENOMEM;
ecf709
-    }
ecf709
-
ecf709
-    username = sss_output_name(tmp_ctx, orig_name, name_dom->case_preserve,
ecf709
-                               rctx->override_space);
ecf709
-    if (username == NULL) {
ecf709
-        ret = EIO;
ecf709
-        goto done;
ecf709
-    }
ecf709
-
ecf709
-    if (name_dom->fqnames) {
ecf709
-        username = sss_tc_fqname(tmp_ctx, name_dom->names, name_dom, username);
ecf709
-        if (username == NULL) {
ecf709
-            DEBUG(SSSDBG_CRIT_FAILURE, "sss_replace_space failed\n");
ecf709
-            ret = EIO;
ecf709
-            goto done;
ecf709
-        }
ecf709
-    }
ecf709
-
ecf709
-    name = talloc_zero(tmp_ctx, struct sized_string);
ecf709
-    if (name == NULL) {
ecf709
-        ret = ENOMEM;
ecf709
-        goto done;
ecf709
-    }
ecf709
-
ecf709
-    to_sized_string(name, username);
ecf709
-    name->str = talloc_steal(name, username);
ecf709
-    *_name = talloc_steal(mem_ctx, name);
ecf709
-    ret = EOK;
ecf709
-done:
ecf709
-    talloc_zfree(tmp_ctx);
ecf709
-    return ret;
ecf709
-}
ecf709
-
ecf709
-int sized_member_name(TALLOC_CTX *mem_ctx,
ecf709
-                      struct resp_ctx *rctx,
ecf709
-                      const char *member_name,
ecf709
-                      struct sized_string **_name)
ecf709
-{
ecf709
-    TALLOC_CTX *tmp_ctx = NULL;
ecf709
-    errno_t ret;
ecf709
-    char *domname;
ecf709
-    struct sss_domain_info *member_dom;
ecf709
-
ecf709
-    tmp_ctx = talloc_new(NULL);
ecf709
-    if (tmp_ctx == NULL) {
ecf709
-        return ENOMEM;
ecf709
-    }
ecf709
-
ecf709
-    ret = sss_parse_internal_fqname(tmp_ctx, member_name, NULL, &domname);
ecf709
-    if (ret != EOK) {
ecf709
-        DEBUG(SSSDBG_CRIT_FAILURE, "sss_parse_internal_fqname failed\n");
ecf709
-        goto done;
ecf709
-    }
ecf709
-
ecf709
-    if (domname == NULL) {
ecf709
-        ret = ERR_WRONG_NAME_FORMAT;
ecf709
-        goto done;
ecf709
-    }
ecf709
-
ecf709
-    member_dom = find_domain_by_name(get_domains_head(rctx->domains),
ecf709
-                                     domname, true);
ecf709
-    if (member_dom == NULL) {
ecf709
-        ret = ERR_DOMAIN_NOT_FOUND;
ecf709
-        goto done;
ecf709
-    }
ecf709
-
ecf709
-    ret = sized_output_name(mem_ctx, rctx, member_name,
ecf709
-                            member_dom, _name);
ecf709
-done:
ecf709
-    talloc_free(tmp_ctx);
ecf709
-    return ret;
ecf709
-}
ecf709
-
ecf709
 const char *
ecf709
 nss_get_pwfield(struct nss_ctx *nctx,
ecf709
                struct sss_domain_info *dom)
ecf709
-- 
ecf709
2.9.3
ecf709