summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2015-05-26 13:49:19 -0700
committerJunio C Hamano <gitster@pobox.com>2015-05-26 13:49:19 -0700
commit6fd58363a4fa5f99c7d764e34e8be1b7044d7252 (patch)
treef3d59359148052df668c546780253de42ca3e362
parentcb9ec8e23e6aee90f80635fdaaed919fe2c7d675 (diff)
parentd358f771e3a0e78ea8ebed7edf48a12a7620c813 (diff)
downloadgit-6fd58363a4fa5f99c7d764e34e8be1b7044d7252.tar.gz
Merge branch 'jc/daemon-no-ipv6-for-2.4.1' into maint
"git daemon" fails to build from the source under NO_IPV6 configuration (regression in 2.4). * jc/daemon-no-ipv6-for-2.4.1: daemon: unbreak NO_IPV6 build regression
-rw-r--r--daemon.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/daemon.c b/daemon.c
index 9ee21877cd..4be10914e6 100644
--- a/daemon.c
+++ b/daemon.c
@@ -633,7 +633,7 @@ static void lookup_hostname(struct hostinfo *hi)
char **ap;
static char addrbuf[HOST_NAME_MAX + 1];
- hent = gethostbyname(hostname.buf);
+ hent = gethostbyname(hi->hostname.buf);
if (hent) {
ap = hent->h_addr_list;
memset(&sa, 0, sizeof sa);