--- lib/tcplib.c.nossl	2012-07-26 13:29:55.813624792 -0700

+++ lib/tcplib.c	2012-07-26 13:38:22.574742892 -0700

@@ -454,8 +454,12 @@

 #ifdef IPV4_SUPPORT

 	ls = (tcpconn_t *)calloc(1, sizeof(tcpconn_t));

+#ifdef HAVE_OPENSSL

 	ls->connstate = ((sslhandling == CONN_SSL_YES) ? CONN_SSL_INIT : CONN_PLAINTEXT);

 	ls->sslhandling = sslhandling;

+#else

+	ls->connstate = CONN_PLAINTEXT;

+#endif

 	ls->usercallback = usercallback;

 	ls->maxlifetime = maxlifetime;

 	ls->family = AF_INET;

@@ -474,8 +478,12 @@

 #ifdef IPV6_SUPPORT

 	ls = (tcpconn_t *)calloc(1, sizeof(tcpconn_t));

+#ifdef HAVE_OPENSSL

 	ls->connstate = ((sslhandling == CONN_SSL_YES) ? CONN_SSL_INIT : CONN_PLAINTEXT);

 	ls->sslhandling = sslhandling;

+#else

+	ls->connstate = CONN_PLAINTEXT;

+#endif

 	ls->usercallback = usercallback;

 	ls->maxlifetime = maxlifetime;

 	ls->family = AF_INET6;

@@ -618,10 +626,10 @@

 {

 	const char *funcid = "conn_starttls";

+#ifdef HAVE_OPENSSL

 	conn_info(funcid, INFO_DEBUG, "Initiating STARTTLS in %s mode\n",

 		  (conn->sslhandling == CONN_SSL_STARTTLS_SERVER) ? "server" : "client");

-#ifdef HAVE_OPENSSL

 	/* The SSL ctx and ssl settings have been setup when the socket was created */

 	if (conn->sslhandling == CONN_SSL_STARTTLS_SERVER) {

 		if (serverctx) {

@@ -676,7 +684,9 @@

 	newconn = (tcpconn_t *)calloc(1, sizeof(tcpconn_t));

 	newconn->connstate = ls->connstate;

+#ifdef HAVE_OPENSSL

 	newconn->sslhandling = ls->sslhandling;

+#endif

 	newconn->usercallback = ls->usercallback;

 	newconn->maxlifetime = ls->maxlifetime;

 	newconn->family = ls->family;

@@ -1463,7 +1473,11 @@

 			newconn->connstate = CONN_PLAINTEXT;

 	}

 	else if ((n == -1) && (errno == EINPROGRESS)) {

+#ifdef HAVE_OPENSSL

 		newconn->connstate = ((sslhandling == CONN_SSL_YES) ? CONN_SSL_CONNECTING : CONN_PLAINTEXT_CONNECTING);

+#else

+		newconn->connstate = CONN_PLAINTEXT_CONNECTING;

+#endif

 	}

 	else {

 		newconn->usercallback(newconn, CONN_CB_CONNECT_FAILED, newconn->userdata);