>From b320a54908ddbafbada38e26cc6edd3b37d34eba Mon Sep 17 00:00:00 2001 From: Jakub Hrozek Date: Mon, 4 Jun 2012 11:07:19 +0200 Subject: [PATCH 1/5] Rename fo_get_server_name to fo_get_server_str_name --- src/providers/data_provider_fo.c | 6 +++--- src/providers/fail_over.c | 2 +- src/providers/fail_over.h | 2 +- src/providers/ipa/ipa_common.c | 4 ++-- src/providers/krb5/krb5_common.c | 2 +- src/providers/ldap/ldap_common.c | 4 ++-- src/tests/fail_over-tests.c | 2 +- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/providers/data_provider_fo.c b/src/providers/data_provider_fo.c index cb14012c17e13172aed7635e04cac692b1136184..d7a4115229a90e400dcb1f00e3288e0e8273b71c 100644 --- a/src/providers/data_provider_fo.c +++ b/src/providers/data_provider_fo.c @@ -426,7 +426,7 @@ static void be_resolve_server_done(struct tevent_req *subreq) return; } DEBUG(6, ("Couldn't resolve server (%s), resolver returned (%d)\n", - fo_get_server_name(state->srv), ret)); + fo_get_server_str_name(state->srv), ret)); state->attempts++; if (state->attempts >= 10) { @@ -458,7 +458,7 @@ static void be_resolve_server_done(struct tevent_req *subreq) srvaddr = fo_get_server_hostent(state->srv); if (!srvaddr) { DEBUG(3, ("FATAL: No hostent available for server (%s)\n", - fo_get_server_name(state->srv))); + fo_get_server_str_name(state->srv))); tevent_req_error(req, EFAULT); return; } @@ -467,7 +467,7 @@ static void be_resolve_server_done(struct tevent_req *subreq) ipaddr, 128); DEBUG(4, ("Found address for server %s: [%s] TTL %d\n", - fo_get_server_name(state->srv), ipaddr, + fo_get_server_str_name(state->srv), ipaddr, srvaddr->addr_list[0]->ttl)); } diff --git a/src/providers/fail_over.c b/src/providers/fail_over.c index 2a96317722cda93bc795a4c6286fa4d24ecfbe95..2d4703fa00b2a2d1034ef300691760a60c2ee864 100644 --- a/src/providers/fail_over.c +++ b/src/providers/fail_over.c @@ -1354,7 +1354,7 @@ fo_get_server_port(struct fo_server *server) return server->port; } -const char *fo_get_server_name(struct fo_server *server) +const char *fo_get_server_str_name(struct fo_server *server) { if (!server->common) { if (fo_is_srv_lookup(server)) { diff --git a/src/providers/fail_over.h b/src/providers/fail_over.h index e5d6c525f6a69f92d0583a795adcbe5e1ab252f3..cb9e54e989f6529f68cc4cc991cafa6f3ed9b07d 100644 --- a/src/providers/fail_over.h +++ b/src/providers/fail_over.h @@ -167,7 +167,7 @@ void *fo_get_server_user_data(struct fo_server *server); int fo_get_server_port(struct fo_server *server); -const char *fo_get_server_name(struct fo_server *server); +const char *fo_get_server_str_name(struct fo_server *server); struct resolv_hostent *fo_get_server_hostent(struct fo_server *server); diff --git a/src/providers/ipa/ipa_common.c b/src/providers/ipa/ipa_common.c index 084400f227477c8fd10eef35cd74d4071c03b3dc..a95b7811f539c2eae47d9a271387a1686b557753 100644 --- a/src/providers/ipa/ipa_common.c +++ b/src/providers/ipa/ipa_common.c @@ -583,7 +583,7 @@ static void ipa_resolve_callback(void *private_data, struct fo_server *server) srvaddr = fo_get_server_hostent(server); if (!srvaddr) { DEBUG(1, ("FATAL: No hostent available for server (%s)\n", - fo_get_server_name(server))); + fo_get_server_str_name(server))); talloc_free(tmp_ctx); return; } @@ -611,7 +611,7 @@ static void ipa_resolve_callback(void *private_data, struct fo_server *server) return; } - new_uri = talloc_asprintf(service, "ldap://%s", fo_get_server_name(server)); + new_uri = talloc_asprintf(service, "ldap://%s", fo_get_server_str_name(server)); if (!new_uri) { DEBUG(2, ("Failed to copy URI ...\n")); talloc_free(tmp_ctx); diff --git a/src/providers/krb5/krb5_common.c b/src/providers/krb5/krb5_common.c index 6e190d0c589d759b39890a3dc7e035efe384156f..5fd164ed84fb88aaa472997fe422cbf3dede1a6a 100644 --- a/src/providers/krb5/krb5_common.c +++ b/src/providers/krb5/krb5_common.c @@ -380,7 +380,7 @@ static void krb5_resolve_callback(void *private_data, struct fo_server *server) srvaddr = fo_get_server_hostent(server); if (!srvaddr) { DEBUG(1, ("FATAL: No hostent available for server (%s)\n", - fo_get_server_name(server))); + fo_get_server_str_name(server))); return; } diff --git a/src/providers/ldap/ldap_common.c b/src/providers/ldap/ldap_common.c index 23f612a5a606abc8631e4822493e16ed4a225d24..2ae262970ebf6248b38ea087df2bfbdbe85b0994 100644 --- a/src/providers/ldap/ldap_common.c +++ b/src/providers/ldap/ldap_common.c @@ -552,7 +552,7 @@ static void sdap_uri_callback(void *private_data, struct fo_server *server) srvaddr = fo_get_server_hostent(server); if (!srvaddr) { DEBUG(1, ("FATAL: No hostent available for server (%s)\n", - fo_get_server_name(server))); + fo_get_server_str_name(server))); talloc_free(tmp_ctx); return; } @@ -571,7 +571,7 @@ static void sdap_uri_callback(void *private_data, struct fo_server *server) tmp = SSS_LDAP_SRV_NAME; } new_uri = talloc_asprintf(service, "%s://%s:%d", - tmp, fo_get_server_name(server), + tmp, fo_get_server_str_name(server), fo_get_server_port(server)); } else { new_uri = talloc_strdup(service, tmp); diff --git a/src/tests/fail_over-tests.c b/src/tests/fail_over-tests.c index efd8756d8a439d6f9817a6779b98ea62bfd0dc3a..d8a6d510b0a00d309b51c4afee3b88f63fe9f615 100644 --- a/src/tests/fail_over-tests.c +++ b/src/tests/fail_over-tests.c @@ -170,7 +170,7 @@ test_resolve_service_callback(struct tevent_req *req) if (task->new_server_status >= 0) fo_set_server_status(server, task->new_server_status); - if (strcmp(fo_get_server_name(server), "unknown name")) { + if (strcmp(fo_get_server_str_name(server), "unknown name")) { he = fo_get_server_hostent(server); fail_if(he == NULL, "%s: fo_get_server_hostent() returned NULL"); for (i = 0; he->addr_list[i]; i++) { -- 1.7.10.2