From: Mark Valence <mrv@openldap.org>
Date: Wed, 27 Oct 1999 22:40:05 +0000 (+0000)
Subject: Changes to make TLS work on Windows
X-Git-Tag: UCDATA_2_4~305
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=a50cd075db1ad3b0ee02317f0b50600b24fe8501;p=openldap

Changes to make TLS work on Windows
---

diff --git a/libraries/libldap/tls.c b/libraries/libldap/tls.c
index 53c4e3b080..3373d822fc 100644
--- a/libraries/libldap/tls.c
+++ b/libraries/libldap/tls.c
@@ -261,8 +261,8 @@ alloc_handle( Sockbuf *sb, void *ctx_arg )
 static void
 update_flags( Sockbuf *sb, SSL * ssl )
 {
-	sb->sb_trans_needs_read  = SSL_want_read(ssl) ? 1 : 0;
-	sb->sb_trans_needs_write = SSL_want_write(ssl) ? 1 : 0;
+	sb->sb_trans_needs_read  = (SSL_want_read(ssl) ? 1 : 0);
+	sb->sb_trans_needs_write = (SSL_want_write(ssl) ? 1 : 0);
 }
 
 /*
@@ -447,8 +447,9 @@ ldap_pvt_tls_set_option( struct ldapoptions *lo, int option, void *arg )
 		case LDAP_OPT_X_TLS_ALLOW:
 		case LDAP_OPT_X_TLS_TRY:
 		case LDAP_OPT_X_TLS_HARD:
-			lo->ldo_tls_mode = *(int *)arg;
-			break;
+			if (lo != NULL)
+				lo->ldo_tls_mode = *(int *)arg;
+			return 0;
 		default:
 			return -1;
 		}
@@ -512,6 +513,10 @@ tls_write( Sockbuf *sb, void *buf, ber_len_t sz )
 	int ret = SSL_write( (SSL *)sb->sb_iodata, buf, sz );
 
 	update_flags(sb, (SSL *)sb->sb_iodata );
+#ifdef WIN32
+	if (sb->sb_trans_needs_write)
+		errno = EWOULDBLOCK;
+#endif
 	return ret;
 }
 
@@ -521,6 +526,10 @@ tls_read( Sockbuf *sb, void *buf, ber_len_t sz )
 	int ret = SSL_read( (SSL *)sb->sb_iodata, buf, sz );
 
 	update_flags(sb, (SSL *)sb->sb_iodata );
+#ifdef WIN32
+	if (sb->sb_trans_needs_read)
+		errno = EWOULDBLOCK;
+#endif
 	return ret;
 }