From 51b5e1475b3e0b7acac34ed382cfaca8411883a4 Mon Sep 17 00:00:00 2001 From: Jakub Hrozek Date: Fri, 15 May 2015 13:02:14 +0200 Subject: AD: Rename ad_create_default_options to ad_create_2way_trust_options Related: https://fedorahosted.org/sssd/ticket/2638 Better reflects what's going on in the function. Also adds a unit test. Reviewed-by: Sumit Bose --- src/providers/ad/ad_common.c | 6 +++--- src/providers/ad/ad_common.h | 6 +++--- src/providers/ad/ad_subdomains.c | 2 +- src/providers/ipa/ipa_subdomains_server.c | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) (limited to 'src/providers') diff --git a/src/providers/ad/ad_common.c b/src/providers/ad/ad_common.c index 4ae08c5a1..e945958fc 100644 --- a/src/providers/ad/ad_common.c +++ b/src/providers/ad/ad_common.c @@ -108,9 +108,9 @@ fail: } struct ad_options * -ad_create_default_options(TALLOC_CTX *mem_ctx, - const char *realm, - const char *hostname) +ad_create_2way_trust_options(TALLOC_CTX *mem_ctx, + const char *realm, + const char *hostname) { struct ad_options *ad_options; errno_t ret; diff --git a/src/providers/ad/ad_common.h b/src/providers/ad/ad_common.h index dcd70bf94..5be2bcd84 100644 --- a/src/providers/ad/ad_common.h +++ b/src/providers/ad/ad_common.h @@ -103,9 +103,9 @@ ad_get_common_options(TALLOC_CTX *mem_ctx, struct sss_domain_info *dom, struct ad_options **_opts); -struct ad_options *ad_create_default_options(TALLOC_CTX *mem_ctx, - const char *realm, - const char *hostname); +struct ad_options *ad_create_2way_trust_options(TALLOC_CTX *mem_ctx, + const char *realm, + const char *hostname); errno_t ad_failover_init(TALLOC_CTX *mem_ctx, struct be_ctx *ctx, diff --git a/src/providers/ad/ad_subdomains.c b/src/providers/ad/ad_subdomains.c index d889dfb6d..f67d49a85 100644 --- a/src/providers/ad/ad_subdomains.c +++ b/src/providers/ad/ad_subdomains.c @@ -115,7 +115,7 @@ ad_subdom_ad_ctx_new(struct be_ctx *be_ctx, return EINVAL; } - ad_options = ad_create_default_options(id_ctx, realm, hostname); + ad_options = ad_create_2way_trust_options(id_ctx, realm, hostname); if (ad_options == NULL) { DEBUG(SSSDBG_OP_FAILURE, "Cannot initialize AD options\n"); talloc_free(ad_options); diff --git a/src/providers/ipa/ipa_subdomains_server.c b/src/providers/ipa/ipa_subdomains_server.c index 03a2c579e..f20160f4b 100644 --- a/src/providers/ipa/ipa_subdomains_server.c +++ b/src/providers/ipa/ipa_subdomains_server.c @@ -144,8 +144,8 @@ ipa_ad_ctx_new(struct be_ctx *be_ctx, errno_t ret; const char *extra_attrs; - ad_options = ad_create_default_options(id_ctx, id_ctx->server_mode->realm, - id_ctx->server_mode->hostname); + ad_options = ad_create_2way_trust_options(id_ctx, id_ctx->server_mode->realm, + id_ctx->server_mode->hostname); if (ad_options == NULL) { DEBUG(SSSDBG_OP_FAILURE, "Cannot initialize AD options\n"); talloc_free(ad_options); -- cgit