From 393306307bd908fcec8858f665226ac56238a21b Mon Sep 17 00:00:00 2001 From: Jakub Hrozek Date: Tue, 28 Jun 2016 18:12:15 +0200 Subject: UTIL: Remove unused functions The conversion to sysdb made several functions obsolete. Remove them. Reviewed-by: Sumit Bose --- src/tests/cmocka/test_fqnames.c | 50 ---------------------------- src/tests/cmocka/test_utils.c | 45 -------------------------- src/util/domain_info_utils.c | 72 ----------------------------------------- src/util/usertools.c | 59 --------------------------------- src/util/util.h | 13 -------- 5 files changed, 239 deletions(-) diff --git a/src/tests/cmocka/test_fqnames.c b/src/tests/cmocka/test_fqnames.c index 3932e9624..f4cdd80ef 100644 --- a/src/tests/cmocka/test_fqnames.c +++ b/src/tests/cmocka/test_fqnames.c @@ -337,9 +337,6 @@ void sss_parse_name_check(struct parse_name_test_ctx *test_ctx, errno_t ret; char *domain = NULL; char *name = NULL; - const char *domain_const = NULL; - const char *name_const = NULL; - check_leaks_push(test_ctx); ret = sss_parse_name(test_ctx, test_ctx->nctx, input_name, @@ -359,23 +356,6 @@ void sss_parse_name_check(struct parse_name_test_ctx *test_ctx, talloc_zfree(name); talloc_zfree(domain); - ret = sss_parse_name_const(test_ctx, test_ctx->nctx, input_name, - &domain_const, &name_const); - assert_int_equal(ret, exp_ret); - - if (exp_name) { - assert_non_null(name_const); - assert_string_equal(name_const, exp_name); - } - - if (exp_domain) { - assert_non_null(domain_const); - assert_string_equal(domain_const, exp_domain); - } - - talloc_free(discard_const(name_const)); - talloc_free(discard_const(domain_const)); - assert_true(check_leaks_pop(test_ctx) == true); } @@ -390,9 +370,6 @@ void parse_name_plain(void **state) ret = sss_parse_name(test_ctx, test_ctx->nctx, NAME, NULL, NULL); assert_int_equal(ret, EOK); - ret = sss_parse_name_const(test_ctx, test_ctx->nctx, NAME, - NULL, NULL); - assert_int_equal(ret, EOK); sss_parse_name_check(test_ctx, NAME, EOK, NAME, NULL); sss_parse_name_check(test_ctx, SPECIALNAME, EOK, SPECIALNAME, NULL); @@ -484,29 +461,6 @@ void sss_parse_name_fail(void **state) sss_parse_name_check(test_ctx, NAME"\\", ERR_REGEX_NOMATCH, NULL, NULL); } -void test_sss_get_domain_name(void **state) -{ - struct parse_name_test_ctx *test_ctx = talloc_get_type(*state, - struct parse_name_test_ctx); - struct { - const char *input; - struct sss_domain_info *domain; - const char *expected; - } data[] = {{"user", test_ctx->dom, "user"}, - {"user", test_ctx->subdom, "user@" SUBDOMNAME}, - {"user@" SUBDOMNAME, test_ctx->subdom, "user@" SUBDOMNAME}, - {NULL, NULL, NULL}}; - char *name; - int i; - - for (i = 0; data[i].input != NULL; i++) { - name = sss_get_domain_name(test_ctx, data[i].input, data[i].domain); - assert_non_null(name); - assert_string_equal(name, data[i].expected); - talloc_free(name); - } -} - int main(int argc, const char *argv[]) { poptContext pc; @@ -547,10 +501,6 @@ int main(int argc, const char *argv[]) cmocka_unit_test_setup_teardown(sss_parse_name_fail, parse_name_test_setup, parse_name_test_teardown), - - cmocka_unit_test_setup_teardown(test_sss_get_domain_name, - parse_name_test_setup, - parse_name_test_teardown), }; /* Set debug level to invalid value so we can deside if -d 0 was used. */ diff --git a/src/tests/cmocka/test_utils.c b/src/tests/cmocka/test_utils.c index ef3e894aa..fd20990ce 100644 --- a/src/tests/cmocka/test_utils.c +++ b/src/tests/cmocka/test_utils.c @@ -1291,48 +1291,6 @@ void test_sss_write_krb5_conf_snippet(void **state) } -void test_fix_domain_in_name_list(void **state) -{ - struct name_init_test_ctx *test_ctx; - - int ret; - struct sss_domain_info *sd; - struct sss_domain_info *dom; - const char *in[] = { "abc@test.case.dom", "def@TEST.case.DOM", NULL}; - char **out = NULL; - - test_ctx = talloc_get_type(*state, struct name_init_test_ctx); - assert_non_null(test_ctx); - - ret = confdb_get_domains(test_ctx->confdb, &dom); - assert_int_equal(ret, EOK); - - ret = sss_names_init(dom, test_ctx->confdb, NULL, &dom->names); - assert_int_equal(ret, EOK); - - sd = talloc_zero(test_ctx, struct sss_domain_info); - assert_non_null(sd); - sd->name = talloc_strdup(sd, "TesT.CasE.DoM"); - assert_non_null(sd->name); - sd->names = dom->names; - sd->fqnames = true; - DLIST_ADD(dom->subdomains, sd); - sd->parent = dom; - - ret = fix_domain_in_name_list(test_ctx, dom, discard_const(in), &out); - assert_int_equal(ret, EOK); - assert_non_null(out); - assert_non_null(out[0]); - assert_string_equal(out[0], "abc@TesT.CasE.DoM"); - assert_non_null(out[1]); - assert_string_equal(out[1], "def@TesT.CasE.DoM"); - assert_null(out[2]); - - talloc_free(out); - talloc_free(sd); - talloc_free(dom); -} - struct unique_file_test_ctx { char *filename; }; @@ -1778,9 +1736,6 @@ int main(int argc, const char *argv[]) setup_leak_tests, teardown_leak_tests), cmocka_unit_test(test_sss_write_krb5_conf_snippet), - cmocka_unit_test_setup_teardown(test_fix_domain_in_name_list, - confdb_test_setup, - confdb_test_teardown), cmocka_unit_test_setup_teardown(test_sss_unique_file, unique_file_test_setup, unique_file_test_teardown), diff --git a/src/util/domain_info_utils.c b/src/util/domain_info_utils.c index f07d7e98b..360f70376 100644 --- a/src/util/domain_info_utils.c +++ b/src/util/domain_info_utils.c @@ -739,78 +739,6 @@ done: return ret; } -errno_t fix_domain_in_name_list(TALLOC_CTX *mem_ctx, - struct sss_domain_info *dom, - char **in, char ***_out) -{ - int ret; - size_t c; - TALLOC_CTX *tmp_ctx; - char **out; - struct sss_domain_info *head; - struct sss_domain_info *out_domain; - char *in_name; - char *in_domain; - - head = get_domains_head(dom); - - tmp_ctx = talloc_new(NULL); - if (tmp_ctx == NULL) { - DEBUG(SSSDBG_OP_FAILURE, "talloc_new failed.\n"); - return ENOMEM; - } - - /* count elements */ - for (c = 0; in[c] != NULL; c++); - - out = talloc_zero_array(tmp_ctx, char *, c + 1); - if (out == NULL) { - DEBUG(SSSDBG_OP_FAILURE, "talloc_array failed.\n"); - ret = ENOMEM; - goto done; - } - - for (c = 0; in[c] != NULL; c++) { - ret = sss_parse_name(tmp_ctx, head->names, in[c], &in_domain, - &in_name); - if (ret != EOK) { - DEBUG(SSSDBG_OP_FAILURE, "sss_parse_name failed for [%s].\n", - in[c]); - goto done; - } - - if (in_domain == NULL) { - out[c] = talloc_strdup(out, in_name); - } else { - out_domain = find_domain_by_name(head, in_domain, true); - if (out_domain == NULL) { - DEBUG(SSSDBG_CRIT_FAILURE, - "Cannot find domain with name [%s].\n", in_domain); - ret = EINVAL; - goto done; - } - - out[c] = sss_get_domain_name(out, in_name, out_domain); - } - - if (out[c] == NULL) { - DEBUG(SSSDBG_OP_FAILURE, "%s failed.\n", - in_domain == NULL ? "talloc_strdup" : "sss_tc_fqname"); - ret = ENOMEM; - goto done; - } - } - - *_out = talloc_steal(mem_ctx, out); - - ret = EOK; - -done: - talloc_free(tmp_ctx); - - return ret; -} - enum sss_domain_state sss_domain_get_state(struct sss_domain_info *dom) { return dom->state; diff --git a/src/util/usertools.c b/src/util/usertools.c index 8e5be9788..e0d520ad1 100644 --- a/src/util/usertools.c +++ b/src/util/usertools.c @@ -365,30 +365,6 @@ int sss_parse_name(TALLOC_CTX *memctx, return EOK; } -int sss_parse_name_const(TALLOC_CTX *memctx, - struct sss_names_ctx *snctx, const char *orig, - const char **_domain, const char **_name) -{ - char *domain; - char *name; - int ret; - - ret = sss_parse_name(memctx, snctx, orig, - (_domain == NULL) ? NULL : &domain, - (_name == NULL) ? NULL : &name); - if (ret == EOK) { - if (_domain != NULL) { - *_domain = domain; - } - - if (_name != NULL) { - *_name = name; - } - } - - return ret; -} - static struct sss_domain_info * match_any_domain_or_subdomain_name( struct sss_domain_info *dom, const char *dmatch) @@ -641,41 +617,6 @@ sss_fqname(char *str, size_t size, struct sss_names_ctx *nctx, name, domain->name, calc_flat_name (domain), NULL); } -char * -sss_get_domain_name(TALLOC_CTX *mem_ctx, - const char *orig_name, - struct sss_domain_info *dom) -{ - char *user_name; - char *domain = NULL; - int ret; - - /* check if the name already contains domain part */ - if (dom->names != NULL) { - ret = sss_parse_name(mem_ctx, dom->names, orig_name, &domain, NULL); - if (ret == ERR_REGEX_NOMATCH) { - DEBUG(SSSDBG_TRACE_FUNC, - "sss_parse_name could not parse domain from [%s]. " - "Assuming it is not FQDN.\n", orig_name); - } else if (ret != EOK) { - DEBUG(SSSDBG_TRACE_FUNC, - "sss_parse_name failed [%d]: %s\n", ret, sss_strerror(ret)); - return NULL; - } - } - - if (IS_SUBDOMAIN(dom) && dom->fqnames && domain == NULL) { - /* we always use the fully qualified name for subdomain users */ - user_name = sss_tc_fqname(mem_ctx, dom->names, dom, orig_name); - } else { - user_name = talloc_strdup(mem_ctx, orig_name); - } - - talloc_free(domain); - - return user_name; -} - errno_t sss_user_by_name_or_uid(const char *input, uid_t *_uid, gid_t *_gid) { uid_t uid; diff --git a/src/util/util.h b/src/util/util.h index 3ed8444b5..8a5caa52c 100644 --- a/src/util/util.h +++ b/src/util/util.h @@ -221,10 +221,6 @@ int sss_parse_name(TALLOC_CTX *memctx, struct sss_names_ctx *snctx, const char *orig, char **_domain, char **_name); -int sss_parse_name_const(TALLOC_CTX *memctx, - struct sss_names_ctx *snctx, const char *orig, - const char **_domain, const char **_name); - int sss_parse_name_for_domains(TALLOC_CTX *memctx, struct sss_domain_info *domains, const char *default_domain, @@ -265,12 +261,6 @@ int sss_fqname(char *str, size_t size, struct sss_names_ctx *nctx, struct sss_domain_info *domain, const char *name); -/* Subdomains use fully qualified names in the cache while primary domains use - * just the name. Return either of these for a specified domain or subdomain - */ -char * -sss_get_domain_name(TALLOC_CTX *mem_ctx, const char *orig_name, - struct sss_domain_info *dom); /* Accepts fqname in the format shortname@domname only. */ errno_t sss_parse_internal_fqname(TALLOC_CTX *mem_ctx, @@ -559,9 +549,6 @@ errno_t get_dom_names(TALLOC_CTX *mem_ctx, char ***_dom_names, int *_dom_names_count); -errno_t fix_domain_in_name_list(TALLOC_CTX *mem_ctx, - struct sss_domain_info *dom, - char **in, char ***_out); /* from util_lock.c */ errno_t sss_br_lock_file(int fd, size_t start, size_t len, int num_tries, useconds_t wait); -- cgit