diff options
| author | Yoshinobu Inoue <shin@FreeBSD.org> | 2000-02-10 02:59:50 +0000 |
|---|---|---|
| committer | Yoshinobu Inoue <shin@FreeBSD.org> | 2000-02-10 02:59:50 +0000 |
| commit | be26adb5b690b8691f393af3c3823e7f8763ea21 (patch) | |
| tree | d687e668fda830028739d49e2bc4157ad21d56db /lib/libc | |
| parent | 1344c9bdf6e874da9fa9a04c91230d817797351a (diff) | |
Notes
Diffstat (limited to 'lib/libc')
| -rw-r--r-- | lib/libc/net/getaddrinfo.c | 4 | ||||
| -rw-r--r-- | lib/libc/net/name6.c | 10 |
2 files changed, 10 insertions, 4 deletions
diff --git a/lib/libc/net/getaddrinfo.c b/lib/libc/net/getaddrinfo.c index 125ea694605f..8b6d6b725190 100644 --- a/lib/libc/net/getaddrinfo.c +++ b/lib/libc/net/getaddrinfo.c @@ -635,7 +635,9 @@ explore_numeric(pai, hostname, servname, res) return 0; flags = pai->ai_flags; - if (inet_pton(afd->a_af, hostname, pton) == 1) { + if ((afd->a_af == AF_INET + ? inet_aton(hostname, (struct in_addr *)pton) + : inet_pton(afd->a_af, hostname, pton)) == 1) { if (pai->ai_family == afd->a_af || pai->ai_family == PF_UNSPEC /*?*/) { GET_AI(cur->ai_next, afd, pton); diff --git a/lib/libc/net/name6.c b/lib/libc/net/name6.c index 3f39d0302dca..31bc26127366 100644 --- a/lib/libc/net/name6.c +++ b/lib/libc/net/name6.c @@ -296,7 +296,7 @@ getipnodebyname(const char *name, int af, int flags, int *errp) return _hpaddr(af, name, &addrbuf, errp); } #endif - if (inet_pton(AF_INET, name, &addrbuf) == 1) { + if (inet_aton(name, (struct in_addr *)&addrbuf) == 1) { if (af != AF_INET) { if (MAPADDRENABLED(flags)) { MAPADDR(&addrbuf, &addrbuf.in_addr); @@ -759,7 +759,9 @@ _files_ghbyname(const char *name, int af, int *errp) } if (!match) continue; - if (inet_pton(af, addrstr, &addrbuf) != 1) { + if ((af == AF_INET + ? inet_aton(addrstr, (struct in_addr *)&addrbuf) + : inet_pton(af, addrstr, &addrbuf)) != 1) { *errp = NO_DATA; /* name found */ continue; } @@ -796,7 +798,9 @@ _files_ghbyaddr(const void *addr, int addrlen, int af, int *errp) while (fgets(buf, sizeof(buf), fp)) { line = buf; if ((p = _hgetword(&line)) == NULL - || inet_pton(af, p, &addrbuf) != 1 + || (af == AF_INET + ? inet_aton(p, (struct in_addr *)&addrbuf) + : inet_pton(af, p, &addrbuf)) != 1 || memcmp(addr, &addrbuf, addrlen) != 0 || (p = _hgetword(&line)) == NULL) continue; |