From 78b4b59f02e5dbf6a122b3647e1f4083fe2a9268 Mon Sep 17 00:00:00 2001 From: Kurt Zeilenga Date: Wed, 23 Nov 2005 19:36:01 +0000 Subject: [PATCH] ITS#4206: s/ACCRIGHTS/ACCRIGHTSLEN/ --- CHANGES | 1 + libraries/libldap/os-local.c | 4 ++-- libraries/liblutil/getpeereid.c | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/CHANGES b/CHANGES index d1c56d2880..8f2343be23 100644 --- 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 1079c50713..20c167c74c 100644 --- 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 e34ae53032..c4b84a646d 100644 --- 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 -- 2.39.5