From 4b80995b072e2bddb3c7f6c2ffcfcbe3fbe40e64 Mon Sep 17 00:00:00 2001 From: "K. Y. Srinivasan" Date: Tue, 26 Jul 2011 11:03:10 -0700 Subject: [PATCH] --- yaml --- r: 267629 b: refs/heads/master c: 5be528c2130a1281ba858296924dd619068bb0e3 h: refs/heads/master i: 267627: 4effcb2db26ff15930a8938ebc5c52331380c187 v: v3 --- [refs] | 2 +- trunk/drivers/staging/hv/tools/hv_kvp_daemon.c | 8 +++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 3655778e7010..40ed2ba1e991 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e54bbc6471d7f788d829e5f3b5922960048fbff7 +refs/heads/master: 5be528c2130a1281ba858296924dd619068bb0e3 diff --git a/trunk/drivers/staging/hv/tools/hv_kvp_daemon.c b/trunk/drivers/staging/hv/tools/hv_kvp_daemon.c index c4cf988ad5cb..11224eddcdc2 100644 --- a/trunk/drivers/staging/hv/tools/hv_kvp_daemon.c +++ b/trunk/drivers/staging/hv/tools/hv_kvp_daemon.c @@ -273,22 +273,20 @@ static int kvp_get_domain_name(char *buffer, int length) { struct addrinfo hints, *info ; - gethostname(buffer, length); int error = 0; + gethostname(buffer, length); memset(&hints, 0, sizeof(hints)); hints.ai_family = AF_INET; /*Get only ipv4 addrinfo. */ hints.ai_socktype = SOCK_STREAM; hints.ai_flags = AI_CANONNAME; - error = getaddrinfo(buffer, "http", &hints, &info); + error = getaddrinfo(buffer, NULL, &hints, &info); if (error != 0) { strcpy(buffer, "getaddrinfo failed\n"); - error = 1; - goto get_domain_done; + return error; } strcpy(buffer, info->ai_canonname); -get_domain_done: freeaddrinfo(info); return error; }