diff options
| author | Tom Lane | 2013-07-25 15:39:08 +0000 |
|---|---|---|
| committer | Tom Lane | 2013-07-25 15:39:46 +0000 |
| commit | 1b09630fce1dfd4116eaaf154766a8a435168193 (patch) | |
| tree | eb1c65bd9205cc6176fcde9d6aafb5c5e6663ad0 /configure.in | |
| parent | 76a7650c40efeeb35be7a60f27ce151ad4e473a2 (diff) | |
Fix configure probe for sys/ucred.h.
The configure script's test for <sys/ucred.h> did not work on OpenBSD,
because on that platform <sys/param.h> has to be included first.
As a result, socket peer authentication was disabled on that platform.
Problem introduced in commit be4585b1c27ac5dbdd0d61740d18f7ad9a00e268.
Andres Freund, slightly simplified by me.
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/configure.in b/configure.in index 3ecdd28006..fe2541952f 100644 --- a/configure.in +++ b/configure.in @@ -982,9 +982,9 @@ AC_SUBST(OSSP_UUID_LIBS) ## dnl sys/socket.h is required by AC_FUNC_ACCEPT_ARGTYPES -AC_CHECK_HEADERS([crypt.h dld.h fp_class.h getopt.h ieeefp.h ifaddrs.h langinfo.h poll.h pwd.h sys/ioctl.h sys/ipc.h sys/poll.h sys/pstat.h sys/resource.h sys/select.h sys/sem.h sys/shm.h sys/socket.h sys/sockio.h sys/tas.h sys/time.h sys/ucred.h sys/un.h termios.h ucred.h utime.h wchar.h wctype.h]) +AC_CHECK_HEADERS([crypt.h dld.h fp_class.h getopt.h ieeefp.h ifaddrs.h langinfo.h poll.h pwd.h sys/ioctl.h sys/ipc.h sys/poll.h sys/pstat.h sys/resource.h sys/select.h sys/sem.h sys/shm.h sys/socket.h sys/sockio.h sys/tas.h sys/time.h sys/un.h termios.h ucred.h utime.h wchar.h wctype.h]) -# On BSD, cpp test for net/if.h will fail unless sys/socket.h +# On BSD, test for net/if.h will fail unless sys/socket.h # is included first. AC_CHECK_HEADERS(net/if.h, [], [], [AC_INCLUDES_DEFAULT @@ -993,7 +993,14 @@ AC_CHECK_HEADERS(net/if.h, [], [], #endif ]) -# At least on IRIX, cpp test for netinet/tcp.h will fail unless +# On OpenBSD, test for sys/ucred.h will fail unless sys/param.h +# is included first. +AC_CHECK_HEADERS(sys/ucred.h, [], [], +[AC_INCLUDES_DEFAULT +#include <sys/param.h> +]) + +# At least on IRIX, test for netinet/tcp.h will fail unless # netinet/in.h is included first. AC_CHECK_HEADERS(netinet/in.h) AC_CHECK_HEADERS(netinet/tcp.h, [], [], @@ -1133,6 +1140,7 @@ PGAC_TYPE_LOCALE_T AC_CHECK_TYPES([struct cmsgcred], [], [], [#include <sys/socket.h> +#include <sys/param.h> #ifdef HAVE_SYS_UCRED_H #include <sys/ucred.h> #endif]) |