From 62416ef0d547018872da915d0fe863780926d7be Mon Sep 17 00:00:00 2001

From: Jakub Hrozek <jhrozek@redhat.com>

Date: Fri, 22 May 2015 18:31:42 +0200

Subject: [PATCH 205/207] SDAP: Add sdap_copy_map_entry

Reviewed-by: Pavel Reichl <preichl@redhat.com>

(cherry picked from commit 12089241f6a6eabf4f0c95669e5fc2bb3b503c06)

Conflicts:

	src/tests/cmocka/test_sdap.c

---

 src/providers/ldap/sdap.c    | 17 +++++++++

 src/providers/ldap/sdap.h    |  4 +++

 src/tests/cmocka/test_sdap.c | 82 ++++++++++++++++++++++++++++++++++++++++++++

 3 files changed, 103 insertions(+)

diff --git a/src/providers/ldap/sdap.c b/src/providers/ldap/sdap.c

index e428d5f..bc9f8b3 100644

--- a/src/providers/ldap/sdap.c

+++ b/src/providers/ldap/sdap.c

@@ -28,6 +28,23 @@

 /* =Retrieve-Options====================================================== */

+errno_t sdap_copy_map_entry(const struct sdap_attr_map *src_map,

+                            struct sdap_attr_map *dst_map,

+                            int entry_index)

+{

+    if (src_map[entry_index].name != NULL) {

+        dst_map[entry_index].name = talloc_strdup(dst_map,

+                                                  src_map[entry_index].name);

+        if (dst_map[entry_index].name == NULL) {

+            return ENOMEM;

+        }

+    } else {

+        dst_map->name = NULL;

+    }

+

+    return EOK;

+}

+

 int sdap_copy_map(TALLOC_CTX *memctx,

                  struct sdap_attr_map *src_map,

                  int num_entries,

diff --git a/src/providers/ldap/sdap.h b/src/providers/ldap/sdap.h

index 921051b..c0e9ff9 100644

--- a/src/providers/ldap/sdap.h

+++ b/src/providers/ldap/sdap.h

@@ -467,6 +467,10 @@ struct sdap_deref_attrs {

     struct sysdb_attrs *attrs;

 };

+errno_t sdap_copy_map_entry(const struct sdap_attr_map *src_map,

+                            struct sdap_attr_map *dst_map,

+                            int entry_index);

+

 int sdap_copy_map(TALLOC_CTX *memctx,

                  struct sdap_attr_map *src_map,

                  int num_entries,

diff --git a/src/tests/cmocka/test_sdap.c b/src/tests/cmocka/test_sdap.c

index 404e100..d1e6959 100644

--- a/src/tests/cmocka/test_sdap.c

+++ b/src/tests/cmocka/test_sdap.c

@@ -718,6 +718,80 @@ void test_parse_no_dn(void **state)

     talloc_free(map);

 }

+struct copy_map_entry_test_ctx {

+    struct sdap_attr_map *src_map;

+    struct sdap_attr_map *dst_map;

+};

+

+static void copy_map_entry_test_setup(void **state)

+{

+    int ret;

+    struct copy_map_entry_test_ctx *test_ctx;

+

+    assert_true(leak_check_setup());

+

+    test_ctx = talloc_zero(global_talloc_context,

+                           struct copy_map_entry_test_ctx);

+    assert_non_null(test_ctx);

+

+    ret = sdap_copy_map(test_ctx, rfc2307_user_map,

+                        SDAP_OPTS_USER, &test_ctx->src_map);

+    assert_int_equal(ret, ERR_OK);

+

+    ret = sdap_copy_map(test_ctx, rfc2307_user_map,

+                        SDAP_OPTS_USER, &test_ctx->dst_map);

+    assert_int_equal(ret, ERR_OK);

+

+    check_leaks_push(test_ctx);

+    *state = test_ctx;

+}

+

+static void copy_map_entry_test_teardown(void **state)

+{

+    struct copy_map_entry_test_ctx *test_ctx = talloc_get_type_abort(*state,

+                                               struct copy_map_entry_test_ctx);

+    assert_true(check_leaks_pop(test_ctx) == true);

+    talloc_free(test_ctx);

+    assert_true(leak_check_teardown());

+    return 0;

+}

+

+static const char *copy_uuid(struct copy_map_entry_test_ctx *test_ctx)

+{

+    errno_t ret;

+

+    assert_null(test_ctx->dst_map[SDAP_AT_USER_UUID].name);

+    ret = sdap_copy_map_entry(test_ctx->src_map, test_ctx->dst_map,

+                              SDAP_AT_USER_UUID);

+    assert_int_equal(ret, EOK);

+    return test_ctx->dst_map[SDAP_AT_USER_UUID].name;

+}

+

+static void test_sdap_copy_map_entry(void **state)

+{

+    struct copy_map_entry_test_ctx *test_ctx = talloc_get_type_abort(*state,

+                                               struct copy_map_entry_test_ctx);

+    const char *uuid_set_val = "test_uuid_val";

+    const char *uuid_val = NULL;

+

+    test_ctx->src_map[SDAP_AT_USER_UUID].name = discard_const(uuid_set_val);

+

+    uuid_val = copy_uuid(test_ctx);

+    assert_non_null(uuid_val);

+    assert_string_equal(uuid_val, uuid_set_val);

+    talloc_free(test_ctx->dst_map[SDAP_AT_USER_UUID].name);

+}

+

+static void test_sdap_copy_map_entry_null_name(void **state)

+{

+    struct copy_map_entry_test_ctx *test_ctx = talloc_get_type_abort(*state,

+                                               struct copy_map_entry_test_ctx);

+    const char *uuid_val = NULL;

+

+    uuid_val = copy_uuid(test_ctx);

+    assert_null(uuid_val);

+}

+

 int main(int argc, const char *argv[])

 {

     poptContext pc;

@@ -763,6 +837,14 @@ int main(int argc, const char *argv[])

         unit_test_setup_teardown(test_parse_deref_map_mismatch,

                                  parse_entry_test_setup,

                                  parse_entry_test_teardown),

+

+        /* Map option tests */

+        unit_test_setup_teardown(test_sdap_copy_map_entry,

+                                 copy_map_entry_test_setup,

+                                 copy_map_entry_test_teardown),

+        unit_test_setup_teardown(test_sdap_copy_map_entry_null_name,

+                                 copy_map_entry_test_setup,

+                                 copy_map_entry_test_teardown),

     };

     /* Set debug level to invalid value so we can deside if -d 0 was used. */

-- 

2.1.0