undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'ep/ident-with-getaddrinfo'

Browse Source 
A build without NO_IPv6 used to use gethostbyname() when guessing
user's hostname, instead of getaddrinfo() that is used in other
codepaths in such a build.

* ep/ident-with-getaddrinfo:
  ident.c: add support for IPv6
This commit is contained in:
Junio C Hamano 2015-12-08 14:14:50 -08:00
commit 545299f822
1 changed files with 27 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
ident.c
View File

@ -70,10 +70,35 @@ static int add_mailname_host(struct strbuf *buf)
return 0; 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(buf);
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) static void add_domainname(struct strbuf *out)
{ {
char buf[1024]; char buf[1024];
struct hostent *he;
if (gethostname(buf, sizeof(buf))) { if (gethostname(buf, sizeof(buf))) {
warning("cannot get host name: %s", strerror(errno)); warning("cannot get host name: %s", strerror(errno));
@ -82,9 +107,7 @@ static void add_domainname(struct strbuf *out)
} }
if (strchr(buf, '.')) if (strchr(buf, '.'))
strbuf_addstr(out, buf); strbuf_addstr(out, buf);
else if ((he = gethostbyname(buf)) && strchr(he->h_name, '.')) else if (canonical_name(buf, out) < 0)
strbuf_addstr(out, he->h_name);
else
strbuf_addf(out, "%s.(none)", buf); strbuf_addf(out, "%s.(none)", buf);
} }