ITS#4893 disable descriptor-based credential passing

diff --git a/CHANGES b/CHANGES
index 6a9c78bc50fb2bd40ba57736fc73f948614472a1..a9bae69d0b17f7bdc31d6d9a58b5d469c90112af 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -7,6 +7,7 @@ OpenLDAP 2.3.35 Engineering
        Fixed acl set minor typo (ITS#4874)
        Fixed ldapmodify to use correct memory free functions (ITS#4901)
        Fixed slapd syncrepl delta-sync modlist free (ITS#4904)
+       Fixed slapd ldapi:// credential issue (ITS#4893)
        Fixed slapd-bdb/hdb startup with missing shm env (ITS#4851)
        Fixed slapd-ldap/meta consistency in referral proxying (ITS#4861)
        Fixed slapd-ldap bind cleanup in case of unauthorized idassert

diff --git a/libraries/liblutil/getpeereid.c b/libraries/liblutil/getpeereid.c
index 1b1902dc33b9ae3586e2c1a7fd5e4e6b0616627a..f7010897acc9e31211cb45da2ee1f94005778754 100644 (file)
--- a/libraries/liblutil/getpeereid.c
+++ b/libraries/liblutil/getpeereid.c
@@ -31,9 +31,10 @@
 #include <sys/ucred.h>
 #endif
 
-#if !defined(SO_PEERCRED) && !defined(LOCAL_PEERCRED) && \
+/* Disabled due to ITS#4893, will revisit in release 2.4 */
+#if 0 /* !defined(SO_PEERCRED) && !defined(LOCAL_PEERCRED) && \
        defined(HAVE_SENDMSG) && (defined(HAVE_STRUCT_MSGHDR_MSG_ACCRIGHTSLEN) || \
-               defined(HAVE_STRUCT_MSGHDR_MSG_CONTROL))
+               defined(HAVE_STRUCT_MSGHDR_MSG_CONTROL)) */
 #define DO_SENDMSG
 #ifdef HAVE_SYS_UIO_H
 #include <sys/uio.h>