system/freebsd-src
system/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src synced 2024-10-15 12:54:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

ping: simplify use of Casper

Browse source 
There is no need to check if capdns is NULL.
If we will build the system without casper all cap_gethostaddr will be
replaced by the standard functions.
This commit is contained in:
Mariusz Zaborski 2018-11-04 20:26:29 +00:00
parent d9c2248dd5
commit d68e2c047b
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=340143
1 changed files with 3 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
sbin/ping/ping.c
View file

@ -566,11 +566,7 @@ main(int argc, char *const *argv)
if (inet_aton(source, &sock_in.sin_addr) != 0) {
shostname = source;
} else {
if (capdns != NULL)
hp = cap_gethostbyname2(capdns, source,
AF_INET);
else
hp = gethostbyname2(source, AF_INET);
hp = cap_gethostbyname2(capdns, source, AF_INET);
if (!hp)
errx(EX_NOHOST, "cannot resolve %s: %s",
source, hstrerror(h_errno));
@ -598,10 +594,7 @@ main(int argc, char *const *argv)
if (inet_aton(target, &to->sin_addr) != 0) {
hostname = target;
} else {
if (capdns != NULL)
hp = cap_gethostbyname2(capdns, target, AF_INET);
else
hp = gethostbyname2(target, AF_INET);
hp = cap_gethostbyname2(capdns, target, AF_INET);
if (!hp)
errx(EX_NOHOST, "cannot resolve %s: %s",
target, hstrerror(h_errno));
@ -1693,10 +1686,7 @@ pr_addr(struct in_addr ina)
if (options & F_NUMERIC)
return inet_ntoa(ina);
if (capdns != NULL)
hp = cap_gethostbyaddr(capdns, (char *)&ina, 4, AF_INET);
else
hp = gethostbyaddr((char *)&ina, 4, AF_INET);
hp = cap_gethostbyaddr(capdns, (char *)&ina, 4, AF_INET);
if (hp == NULL)
return inet_ntoa(ina);