From: Quanah Gibson-Mount <quanah@openldap.org>
Date: Fri, 14 Aug 2009 00:57:30 +0000 (+0000)
Subject: Fix prev commit again, IPPROTO_TCP is the documented correct approach
X-Git-Tag: OPENLDAP_REL_ENG_2_4_18~48
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=a882a3018f5f517e957902cb9adbdfd63bbc0cc3;p=openldap

Fix prev commit again, IPPROTO_TCP is the documented correct approach
---

diff --git a/libraries/libldap/os-ip.c b/libraries/libldap/os-ip.c
index bd4596105d..ec3244c2de 100644
--- a/libraries/libldap/os-ip.c
+++ b/libraries/libldap/os-ip.c
@@ -145,11 +145,7 @@ ldap_int_prepare_socket(LDAP *ld, int s, int proto )
 		if ( ld->ld_options.ldo_keepalive_idle > 0 )
 		{
 #ifdef TCP_KEEPIDLE
-/* AIX uses protocol numbers for everything besides SOL_SOCKET */
-#ifndef SOL_TCP
-#define	SOL_TCP	IPPROTO_TCP
-#endif
-			if ( setsockopt( s, SOL_TCP, TCP_KEEPIDLE,
+			if ( setsockopt( s, IPPROTO_TCP, TCP_KEEPIDLE,
 					(void*) &ld->ld_options.ldo_keepalive_idle,
 					sizeof(ld->ld_options.ldo_keepalive_idle) ) == AC_SOCKET_ERROR )
 			{