diff options
author | Jakub Hrozek <jhrozek@redhat.com> | 2012-06-04 11:07:19 +0200 |
---|---|---|
committer | Stephen Gallagher <sgallagh@redhat.com> | 2012-06-04 14:16:12 -0400 |
commit | 86ca7e034185574d31bfcbdb47dba666321cf256 (patch) | |
tree | 2c1f091fe7130b5806fad28c0bb126be08800c52 | |
parent | cafcf367f1d41aa7d82c7108747e32918cb93e64 (diff) | |
download | sssd-86ca7e034185574d31bfcbdb47dba666321cf256.tar.gz sssd-86ca7e034185574d31bfcbdb47dba666321cf256.tar.xz sssd-86ca7e034185574d31bfcbdb47dba666321cf256.zip |
Rename fo_get_server_name to fo_get_server_str_name
-rw-r--r-- | src/providers/data_provider_fo.c | 6 | ||||
-rw-r--r-- | src/providers/fail_over.c | 2 | ||||
-rw-r--r-- | src/providers/fail_over.h | 2 | ||||
-rw-r--r-- | src/providers/ipa/ipa_common.c | 4 | ||||
-rw-r--r-- | src/providers/krb5/krb5_common.c | 2 | ||||
-rw-r--r-- | src/providers/ldap/ldap_common.c | 4 | ||||
-rw-r--r-- | 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 cb14012c1..d7a411522 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 2a9631772..2d4703fa0 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 e5d6c525f..cb9e54e98 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 084400f22..a95b7811f 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 6e190d0c5..5fd164ed8 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 23f612a5a..2ae262970 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 efd8756d8..d8a6d510b 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++) { |