isa/sudo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Solaris 2.6 has the prototypes for inet_pton() and inet_ntop() in

Browse Source 
resolv.h.
This commit is contained in:
Todd C. Miller
2015-07-09 10:11:25 -06:00
parent b73d96804b
commit 43a57126ea
7 changed files with 33 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
config.h.in
View File

@@ -975,6 +975,10 @@
*/ */
#undef MAX_UID_T_LEN #undef MAX_UID_T_LEN
/* Define to 1 if resolv.h must be included to get the `inet_ntop' or
`inet_pton' function prototypes. */
#undef NEED_RESOLV_H
/* Define to 1 if you don't want sudo to prompt for a password by default. */ /* Define to 1 if you don't want sudo to prompt for a password by default. */
#undef NO_AUTHENTICATION #undef NO_AUTHENTICATION

7
configure vendored
View File

@@ -20349,6 +20349,12 @@ $as_echo "yes" >&6; }
NET_LIBS="${NET_LIBS} $libs" NET_LIBS="${NET_LIBS} $libs"
INET_PTON_LIBS="$libs" INET_PTON_LIBS="$libs"
case "$libs" in
*-lresolv*)
$as_echo "#define NEED_RESOLV_H 1" >>confdefs.h
;;
esac
break break
else else
@@ -26790,5 +26796,6 @@ fi

6
configure.ac
View File

@@ -2790,6 +2790,11 @@ AC_CHECK_FUNC([inet_pton], [
AC_DEFINE(HAVE_INET_PTON) AC_DEFINE(HAVE_INET_PTON)
NET_LIBS="${NET_LIBS} $libs" NET_LIBS="${NET_LIBS} $libs"
INET_PTON_LIBS="$libs" INET_PTON_LIBS="$libs"
case "$libs" in
*-lresolv*)
AC_DEFINE(NEED_RESOLV_H)
;;
esac
break break
], [], [$extralibs]) ], [], [$extralibs])
done done
@@ -4336,6 +4341,7 @@ AH_TEMPLATE(HAVE__NSS_INITF_GROUP, [Define to 1 if you have the `_nss_initf_grou
AH_TEMPLATE(HAVE___NSS_INITF_GROUP, [Define to 1 if you have the `__nss_initf_group' function.]) AH_TEMPLATE(HAVE___NSS_INITF_GROUP, [Define to 1 if you have the `__nss_initf_group' function.])
AH_TEMPLATE(HAVE__NSS_XBYY_BUF_ALLOC, [Define to 1 if you have the `_nss_XbyY_buf_alloc' function.]) AH_TEMPLATE(HAVE__NSS_XBYY_BUF_ALLOC, [Define to 1 if you have the `_nss_XbyY_buf_alloc' function.])
AH_TEMPLATE(HAVE___NSS_XBYY_BUF_ALLOC, [Define to 1 if you have the `__nss_XbyY_buf_alloc' function.]) AH_TEMPLATE(HAVE___NSS_XBYY_BUF_ALLOC, [Define to 1 if you have the `__nss_XbyY_buf_alloc' function.])
AH_TEMPLATE(NEED_RESOLV_H, [Define to 1 if resolv.h must be included to get the `inet_ntop' or `inet_pton' function prototypes.])
AH_TEMPLATE(HAVE_STRNLEN, [Define to 1 if you have the `strnlen' function.]) AH_TEMPLATE(HAVE_STRNLEN, [Define to 1 if you have the `strnlen' function.])
dnl dnl

4
lib/util/getaddrinfo.c
View File

@@ -51,6 +51,10 @@
#include <arpa/inet.h> #include <arpa/inet.h>
#include <netinet/in.h> #include <netinet/in.h>
#ifdef NEED_RESOLV_H
# include <arpa/nameser.h>
# include <resolv.h>
#endif /* NEED_RESOLV_H */
#include "sudo_compat.h" #include "sudo_compat.h"
#include "compat/getaddrinfo.h" #include "compat/getaddrinfo.h"

4
plugins/sudoers/interfaces.c
View File

@@ -29,6 +29,10 @@
#include <unistd.h> #include <unistd.h>
#include <netinet/in.h> #include <netinet/in.h>
#include <arpa/inet.h> #include <arpa/inet.h>
#ifdef NEED_RESOLV_H
# include <arpa/nameser.h>
# include <resolv.h>
#endif /* NEED_RESOLV_H */
#include <netdb.h> #include <netdb.h>
#include <errno.h> #include <errno.h>

4
plugins/sudoers/match_addr.c
View File

@@ -36,6 +36,10 @@
#include <unistd.h> #include <unistd.h>
#include <netinet/in.h> #include <netinet/in.h>
#include <arpa/inet.h> #include <arpa/inet.h>
#ifdef NEED_RESOLV_H
# include <arpa/nameser.h>
# include <resolv.h>
#endif /* NEED_RESOLV_H */
#include "sudoers.h" #include "sudoers.h"
#include "interfaces.h" #include "interfaces.h"

4
src/net_ifs.c
View File

@@ -67,6 +67,10 @@ struct rtentry;
#endif /* _MIPS */ #endif /* _MIPS */
#include <netinet/in.h> #include <netinet/in.h>
#include <arpa/inet.h> #include <arpa/inet.h>
#ifdef NEED_RESOLV_H
# include <arpa/nameser.h>
# include <resolv.h>
#endif /* NEED_RESOLV_H */
#include <net/if.h> #include <net/if.h>
#ifdef HAVE_GETIFADDRS #ifdef HAVE_GETIFADDRS
# include <ifaddrs.h> # include <ifaddrs.h>