mirrors/musl
1
0
Fork 0
mirror of https://git.musl-libc.org/git/musl synced 2025-01-10 00:32:27 +03:00
Code Issues Packages Projects Releases Wiki Activity

in hosts file lookups, use only first match for canonical name

Browse Source 
the existing code clobbered the canonical name already discovered
every time another matching line was found, which will necessarily be
the case when a hostname has both IPv4 and v6 definitions.

patch by Wolf.
This commit is contained in:
Rich Felker 2020-08-04 14:20:40 -04:00
parent 73cc775bee
commit 20c6d83f55
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/network/lookup_name.c
View File

@ -50,7 +50,7 @@ static int name_from_hosts(struct address buf[static MAXADDRS], char canon[stati
{ {
char line[512]; char line[512];
size_t l = strlen(name); size_t l = strlen(name);
int cnt = 0, badfam = 0; int cnt = 0, badfam = 0, have_canon = 0;
unsigned char _buf[1032]; unsigned char _buf[1032];
FILE _f, *f = __fopen_rb_ca("/etc/hosts", &_f, _buf, sizeof _buf); FILE _f, *f = __fopen_rb_ca("/etc/hosts", &_f, _buf, sizeof _buf);
if (!f) switch (errno) { if (!f) switch (errno) {
@ -83,11 +83,16 @@ static int name_from_hosts(struct address buf[static MAXADDRS], char canon[stati
continue; continue;
} }
if (have_canon) continue;
/* Extract first name as canonical name */ /* Extract first name as canonical name */
for (; *p && isspace(*p); p++); for (; *p && isspace(*p); p++);
for (z=p; *z && !isspace(*z); z++); for (z=p; *z && !isspace(*z); z++);
*z = 0; *z = 0;
if (is_valid_hostname(p)) memcpy(canon, p, z-p+1); if (is_valid_hostname(p)) {
have_canon = 1;
memcpy(canon, p, z-p+1);
}
} }
__fclose_ca(f); __fclose_ca(f);
return cnt ? cnt : badfam; return cnt ? cnt : badfam;