diff options
| author |   Gilles Chehade <gilles@poolp.org> | 2019-11-10 19:40:11 +0100 |
|---|---|---|
| committer | Gilles Chehade <gilles@poolp.org> | 2019-11-10 19:40:11 +0100 |
| commit | 2763a908f80ee68d1e9788f70d645ab6015365b9 (patch) | |
| tree | 4aef5c96f7192db7a3df4adcbb7d9858fa9daa0b | |
| parent | move LLONG_MAX declaration check earlier: (diff) | |
| download | OpenSMTPD-2763a908f80ee68d1e9788f70d645ab6015365b9.tar.xz OpenSMTPD-2763a908f80ee68d1e9788f70d645ab6015365b9.zip | |
conditional getpeereid()
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | openbsd-compat/Makefile.am | 5 | ||||
| -rw-r--r-- | openbsd-compat/getpeereid.c (renamed from openbsd-compat/bsd-getpeereid.c) | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac index b02eb37c..7912abc6 100644 --- a/configure.ac +++ b/configure.ac @@ -2002,6 +2002,7 @@ AM_CONDITIONAL([NEED_FPARSELN], [test "x$ac_cv_have_fparseln" != "xyes"]) AM_CONDITIONAL([NEED_FREEZERO], [test "x$ac_cv_have_freezero" != "xyes"]) #AM_CONDITIONAL([NEED_GETLINE], [test "x$ac_cv_have_getline" != "xyes"]) +AM_CONDITIONAL([NEED_GETPEEREID], [test "x$ac_cv_have_getpeereid" != "xyes"]) AM_CONDITIONAL([NEED_IMSG], [test "x$ac_cv_have_imsg_init" != "xyes"]) AM_CONDITIONAL([NEED_INET_NET_PTON], [test "x$ac_cv_have_inet_net_pton" != "xyes"]) diff --git a/openbsd-compat/Makefile.am b/openbsd-compat/Makefile.am index 2f5b8d14..d2a423c7 100644 --- a/openbsd-compat/Makefile.am +++ b/openbsd-compat/Makefile.am @@ -5,7 +5,6 @@ libopenbsd_compat_a_SOURCES = empty.c libopenbsd_compat_a_SOURCES += arc4random.c libopenbsd_compat_a_SOURCES += SSL_CTX_use_certificate_chain_mem.c libopenbsd_compat_a_SOURCES += base64.c -libopenbsd_compat_a_SOURCES += bsd-getpeereid.c libopenbsd_compat_a_SOURCES += bsd-misc.c libopenbsd_compat_a_SOURCES += bsd-waitpid.c libopenbsd_compat_a_SOURCES += entropy.c @@ -71,6 +70,10 @@ endif #libopenbsd_compat_a_SOURCES += getline.c #endif +#if NEED_GETPEEREID +libopenbsd_compat_a_SOURCES += getpeereid.c +#endif + if NEED_IMSG libopenbsd_compat_a_SOURCES += imsg.c libopenbsd_compat_a_SOURCES += imsg-buffer.c diff --git a/openbsd-compat/bsd-getpeereid.c b/openbsd-compat/getpeereid.c index 5f7e677e..c8ce808f 100644 --- a/openbsd-compat/bsd-getpeereid.c +++ b/openbsd-compat/getpeereid.c @@ -16,8 +16,6 @@ #include "includes.h" -#if !defined(HAVE_GETPEEREID) - #include <sys/types.h> #include <sys/socket.h> @@ -69,5 +67,3 @@ getpeereid(int s, uid_t *euid, gid_t *gid) return (0); } #endif /* defined(SO_PEERCRED) */ - -#endif /* !defined(HAVE_GETPEEREID) */ |