Merge branch 'ep/ident-with-getaddrinfo'

gitster · gitster · commit 47be26dfcc09 · 2015-12-15T09:33:19.000-08:00
A fix-up for recent topic.

* ep/ident-with-getaddrinfo:
  ident: fix undefined variable when NO_IPV6 is set
diff --git a/ident.c b/ident.c
@@ -86,7 +86,7 @@ static int canonical_name(const char *host, struct strbuf *out)
 		freeaddrinfo(ai);
 	}
 #else
-	struct hostent *he = gethostbyname(buf);
+	struct hostent *he = gethostbyname(host);
 	if (he && strchr(he->h_name, '.')) {
 		strbuf_addstr(out, he->h_name);
 		status = 0;

Original file line number	Diff line number	Diff line change
`@@ -86,7 +86,7 @@ static int canonical_name(const char host, struct strbuf out)`
`86`	`86`	`freeaddrinfo(ai);`
`87`	`87`	`}`
`88`	`88`	`#else`
`89`		`- struct hostent *he = gethostbyname(buf);`
	`89`	`+ struct hostent *he = gethostbyname(host);`
`90`	`90`	`if (he && strchr(he->h_name, '.')) {`
`91`	`91`	`strbuf_addstr(out, he->h_name);`
`92`	`92`	`status = 0;`