From: Junio C Hamano <gitster@pobox•com>
To: git@vger•kernel.org
Cc: "Eduardo Espejo" <eduardo.espejo@gmail•com>,
"René Scharfe" <l.s.r@web•de>
Subject: [PATCH] daemon: unbreak NO_IPV6 build regression
Date: Tue, 05 May 2015 11:07:12 -0700 [thread overview]
Message-ID: <xmqqd22eew4v.fsf_-_@gitster.dls.corp.google.com> (raw)
In-Reply-To: <xmqqioc6ewnw.fsf@gitster.dls.corp.google.com> (Junio C. Hamano's message of "Tue, 05 May 2015 10:55:47 -0700")
When 01cec54e (daemon: deglobalize hostname information, 2015-03-07)
wrapped the global variables such as hostname inside a struct, it
forgot to convert one location that spelled "hostname" that needs to
be updated to "hi->hostname".
This was inside NO_IPV6 block, and was not caught by anybody.
Reported by: Eduardo Espejo
Signed-off-by: Junio C Hamano <gitster@pobox•com>
---
daemon.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/daemon.c b/daemon.c
index 9ee2187..4be1091 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);
--
2.4.0-311-gf1d9b8d
next prev parent reply other threads:[~2015-05-05 18:07 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-05-05 14:20 [BUG] deamon.c does not compile when NO_IPV6 is used Eduardo Espejo
2015-05-05 17:55 ` Junio C Hamano
2015-05-05 18:07 ` Junio C Hamano [this message]
2015-05-18 22:29 ` [PATCH] daemon: unbreak NO_IPV6 build regression René Scharfe
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqd22eew4v.fsf_-_@gitster.dls.corp.google.com \
--to=gitster@pobox$(echo .)com \
--cc=eduardo.espejo@gmail$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=l.s.r@web$(echo .)de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox