X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=libraries%2Flibldap%2Fopen.c;h=ec5011744a567e2537a89217eb12e6ccb6e6dada;hb=6062cd9777bd2e1d9d99e5b3d5e25d0dab87f7ba;hp=b4d22d7be6180b6d878bd44a89131999e769d4ec;hpb=fb5ba5f09c604aa2c9cdf7076141da60fbb925b3;p=openldap

diff --git a/libraries/libldap/open.c b/libraries/libldap/open.c
index b4d22d7be6..ec5011744a 100644
--- a/libraries/libldap/open.c
+++ b/libraries/libldap/open.c
@@ -1,7 +1,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1998-2011 The OpenLDAP Foundation.
+ * Copyright 1998-2012 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -344,7 +344,6 @@ ldap_init_fd(
 
 	/* Add the connection to the *LDAP's select pool */
 	ldap_mark_select_read( ld, conn->lconn_sb );
-	ldap_mark_select_write( ld, conn->lconn_sb );
 	
 	*ldp = ld;
 	return LDAP_SUCCESS;
@@ -502,7 +501,6 @@ ldap_open_internal_connection( LDAP **ldp, ber_socket_t *fdp )
 
 	/* Add the connection to the *LDAP's select pool */
 	ldap_mark_select_read( ld, c->lconn_sb );
-	ldap_mark_select_write( ld, c->lconn_sb );
 
 	/* Make this connection an LDAP V3 protocol connection */
 	rc = LDAP_VERSION3;
@@ -542,7 +540,7 @@ ldap_int_check_async_open( LDAP *ld, ber_socket_t sd )
 	struct timeval tv = { 0 };
 	int rc;
 
-	rc = ldap_int_poll( ld, sd, &tv );
+	rc = ldap_int_poll( ld, sd, &tv, 1 );
 	switch ( rc ) {
 	case 0:
 		/* now ready to start tls */