diff options
| author | Alan Coopersmith <alan.coopersmith@oracle.com> | 2018-11-12 13:27:55 -0800 |
|---|---|---|
| committer | Alan Coopersmith <alan.coopersmith@oracle.com> | 2018-11-12 13:31:51 -0800 |
| commit | 62bfa9d421138ec538682eb0323fa9f438d6b2c7 (patch) | |
| tree | 52065fad2301d86f9a591dfcd06b2381fff82bcd | |
| parent | 0c3627bc7dac395c6af8bd1fb747ef3556e95fb4 (diff) | |
Prefer inet_aton, if available, over inet_addr
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
| -rw-r--r-- | configure.ac | 3 | ||||
| -rw-r--r-- | xhost.c | 9 |
2 files changed, 10 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index 47147df..d174e42 100644 --- a/configure.ac +++ b/configure.ac @@ -42,6 +42,9 @@ case $host_os in ;; esac +# Checks for library functions. +AC_CHECK_FUNCS([inet_aton]) + AC_CONFIG_FILES([ Makefile man/Makefile]) @@ -509,10 +509,15 @@ change_host(Display *dpy, char *name, Bool add) } #ifdef NEEDSOCKETS /* - * First see if inet_addr() can grok the name; if so, then use it. + * First see if inet_aton/inet_addr can grok the name; if so, then use it. */ if (((family == FamilyWild) || (family == FamilyInternet)) && - ((addr.s_addr = inet_addr(name)) != -1)) { +#ifdef HAVE_INET_ATON + (inet_aton (name, &addr) != 0) +#else + ((addr.s_addr = inet_addr(name)) != -1) +#endif + ) { ha.family = FamilyInternet; ha.length = 4; /* but for Cray would be sizeof(addr.s_addr) */ ha.address = (char *)&addr; /* but for Cray would be &addr.s_addr */ |