ITS#4206: s/ACCRIGHTS/ACCRIGHTSLEN/

diff --git a/CHANGES b/CHANGES
index d1c56d28809222405b88f49b5c5ed52fca24a5f0..8f2343be230217cea302b0ee62bc3b11df809c68 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,7 @@
 OpenLDAP 2.3 Change Log
 
 OpenLDAP 2.3.13 Engineering
+       Fixed libldap/liblutil MSG_ACCRIGHTSLEN bug (ITS#4206)
 
 OpenLDAP 2.3.12 Release
        Fixed libldap ldapi:// authdn construction

diff --git a/libraries/libldap/os-local.c b/libraries/libldap/os-local.c
index 1079c5071363bc55423acb732f0abf2a8b16067d..20c167c74ca4007ec88bc63f2747be5e22656324 100644 (file)
--- a/libraries/libldap/os-local.c
+++ b/libraries/libldap/os-local.c
@@ -156,8 +156,8 @@ ldap_pvt_is_socket_ready(LDAP *ld, int s)
 
 #if !defined(HAVE_GETPEEREID) && \
        !defined(SO_PEERCRED) && !defined(LOCAL_PEERCRED) && \
-       defined(HAVE_SENDMSG) && (defined(HAVE_STRUCT_MSGHDR_MSG_ACCRIGHTS) || \
-                                 defined(HAVE_STRUCT_MSGHDR_MSG_CONTROL))
+       defined(HAVE_SENDMSG) && (defined(HAVE_STRUCT_MSGHDR_MSG_ACCRIGHTSLEN) || \
+               defined(HAVE_STRUCT_MSGHDR_MSG_CONTROL))
 #define DO_SENDMSG
 static const char abandonPDU[] = {LDAP_TAG_MESSAGE, 6,
        LDAP_TAG_MSGID, 1, 0, LDAP_REQ_ABANDON, 1, 0};

diff --git a/libraries/liblutil/getpeereid.c b/libraries/liblutil/getpeereid.c
index e34ae53032602901cfa53c2dca0bb776982f525a..c4b84a646d180d99aaa823b5d9d0bec6c3195d67 100644 (file)
--- a/libraries/liblutil/getpeereid.c
+++ b/libraries/liblutil/getpeereid.c
@@ -32,8 +32,8 @@
 #endif
 
 #if !defined(SO_PEERCRED) && !defined(LOCAL_PEERCRED) && \
-       defined(HAVE_SENDMSG) && (defined(HAVE_STRUCT_MSGHDR_MSG_ACCRIGHTS) || \
-                                 defined(HAVE_STRUCT_MSGHDR_MSG_CONTROL))
+       defined(HAVE_SENDMSG) && (defined(HAVE_STRUCT_MSGHDR_MSG_ACCRIGHTSLEN) || \
+               defined(HAVE_STRUCT_MSGHDR_MSG_CONTROL))
 #define DO_SENDMSG
 #ifdef HAVE_SYS_UIO_H
 #include <sys/uio.h>