diff options
| author | Stephen Gallagher <sgallagh@redhat.com> | 2011-01-21 15:51:29 -0500 |
|---|---|---|
| committer | Stephen Gallagher <sgallagh@redhat.com> | 2011-01-21 16:20:14 -0500 |
| commit | eaee7fa08b609215fcb1aa04db5ec5683d4d3d0b (patch) | |
| tree | f39086bcf129ab7c0fd9337e01052455ab067e9b | |
| parent | 9917b96e31df3fa992d235a050ed1dc0e9939b3d (diff) | |
| download | sssd-eaee7fa08b609215fcb1aa04db5ec5683d4d3d0b.tar.gz sssd-eaee7fa08b609215fcb1aa04db5ec5683d4d3d0b.tar.xz sssd-eaee7fa08b609215fcb1aa04db5ec5683d4d3d0b.zip | |
Rename dns_domain to discovery domain for fo_add_srv_server()
| -rw-r--r-- | src/providers/fail_over.c | 18 | ||||
| -rw-r--r-- | src/providers/fail_over.h | 2 |
2 files changed, 12 insertions, 8 deletions
diff --git a/src/providers/fail_over.c b/src/providers/fail_over.c index 3c560089b..fc03946c0 100644 --- a/src/providers/fail_over.c +++ b/src/providers/fail_over.c @@ -500,22 +500,25 @@ create_server_common(TALLOC_CTX *mem_ctx, struct fo_ctx *ctx, const char *name) int fo_add_srv_server(struct fo_service *service, const char *srv, - const char *dns_domain, const char *sssd_domain, + const char *discovery_domain, const char *sssd_domain, const char *proto, void *user_data) { struct fo_server *server; DEBUG(3, ("Adding new SRV server in domain '%s', to service '%s' using %s\n", - dns_domain ? dns_domain : "unknown", service->name, proto)); + discovery_domain ? discovery_domain : "unknown", + service->name, proto)); DLIST_FOR_EACH(server, service->server_list) { if (server->user_data != user_data) continue; if (fo_is_srv_lookup(server)) { - if (((dns_domain == NULL && server->srv_data->dns_domain == NULL) || - (dns_domain != NULL && server->srv_data->dns_domain != NULL && - strcasecmp(server->srv_data->dns_domain, dns_domain) == 0)) && + if (((discovery_domain == NULL && + server->srv_data->dns_domain == NULL) || + (discovery_domain != NULL && + server->srv_data->dns_domain != NULL && + strcasecmp(server->srv_data->dns_domain, discovery_domain) == 0)) && strcasecmp(server->srv_data->proto, proto) == 0) { return EEXIST; } @@ -541,8 +544,9 @@ fo_add_srv_server(struct fo_service *service, const char *srv, server->srv_data->srv == NULL) return ENOMEM; - if (dns_domain) { - server->srv_data->discovery_domain = talloc_strdup(server->srv_data, dns_domain); + if (discovery_domain) { + server->srv_data->discovery_domain = talloc_strdup(server->srv_data, + discovery_domain); if (server->srv_data->discovery_domain == NULL) return ENOMEM; server->srv_data->dns_domain = diff --git a/src/providers/fail_over.h b/src/providers/fail_over.h index 6a3101fed..6e52d3c66 100644 --- a/src/providers/fail_over.h +++ b/src/providers/fail_over.h @@ -116,7 +116,7 @@ int fo_add_server(struct fo_service *service, int fo_add_srv_server(struct fo_service *service, const char *srv, - const char *dns_domain, + const char *discovery_domain, const char *sssd_domain, const char *proto, void *user_data); |