mirror of
https://github.com/git/git
synced 2024-08-25 10:45:59 +00:00
Merge branch 'ep/ident-with-getaddrinfo' into maint
A fix-up for recent topic. * ep/ident-with-getaddrinfo: ident: fix undefined variable when NO_IPV6 is set ident.c: add support for IPv6
This commit is contained in:
commit
de301c5c85
31
ident.c
31
ident.c
|
@ -70,10 +70,35 @@ static int add_mailname_host(struct strbuf *buf)
|
|||
return 0;
|
||||
}
|
||||
|
||||
static int canonical_name(const char *host, struct strbuf *out)
|
||||
{
|
||||
int status = -1;
|
||||
|
||||
#ifndef NO_IPV6
|
||||
struct addrinfo hints, *ai;
|
||||
memset (&hints, '\0', sizeof (hints));
|
||||
hints.ai_flags = AI_CANONNAME;
|
||||
if (!getaddrinfo(host, NULL, &hints, &ai)) {
|
||||
if (ai && strchr(ai->ai_canonname, '.')) {
|
||||
strbuf_addstr(out, ai->ai_canonname);
|
||||
status = 0;
|
||||
}
|
||||
freeaddrinfo(ai);
|
||||
}
|
||||
#else
|
||||
struct hostent *he = gethostbyname(host);
|
||||
if (he && strchr(he->h_name, '.')) {
|
||||
strbuf_addstr(out, he->h_name);
|
||||
status = 0;
|
||||
}
|
||||
#endif /* NO_IPV6 */
|
||||
|
||||
return status;
|
||||
}
|
||||
|
||||
static void add_domainname(struct strbuf *out)
|
||||
{
|
||||
char buf[1024];
|
||||
struct hostent *he;
|
||||
|
||||
if (gethostname(buf, sizeof(buf))) {
|
||||
warning("cannot get host name: %s", strerror(errno));
|
||||
|
@ -82,9 +107,7 @@ static void add_domainname(struct strbuf *out)
|
|||
}
|
||||
if (strchr(buf, '.'))
|
||||
strbuf_addstr(out, buf);
|
||||
else if ((he = gethostbyname(buf)) && strchr(he->h_name, '.'))
|
||||
strbuf_addstr(out, he->h_name);
|
||||
else
|
||||
else if (canonical_name(buf, out) < 0)
|
||||
strbuf_addf(out, "%s.(none)", buf);
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue