summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2006-04-01 00:48:55 +0000
committerLennart Poettering <lennart@poettering.net>2006-04-01 00:48:55 +0000
commit97e78f6dfe401925f97158f99a3cafd43d19a463 (patch)
tree522de69d655a681401c23e48e737227c53c8bb73
parentecdb90c3de218098b6166718eb2872e0badb9c3c (diff)
when resolving a service, don't return host name that was assigned to the actual A/AAAA record, but the one specified in the SRV RR. This broke vhost setups with CNAMEs. (This fixes Ubuntu bug 36642)
git-svn-id: file:///home/lennart/svn/public/avahi/trunk@1185 941a03a8-eaeb-0310-b9a0-b1bbd8fe43fe
-rw-r--r--avahi-core/resolve-service.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/avahi-core/resolve-service.c b/avahi-core/resolve-service.c
index a897546..1ad6078 100644
--- a/avahi-core/resolve-service.c
+++ b/avahi-core/resolve-service.c
@@ -131,7 +131,7 @@ static void finish(AvahiSServiceResolver *r, AvahiResolverEvent event) {
r->service_name,
r->service_type,
r->domain_name,
- r->address_record ? r->address_record->key->name : r->srv_record->data.srv.name,
+ r->srv_record->data.srv.name,
r->address_record ? &a : NULL,
r->srv_record->data.srv.port,
r->txt_record ? r->txt_record->data.txt.string_list : NULL,