From: Luke Howard <lukeh@openldap.org>
Date: Tue, 20 May 2003 02:59:19 +0000 (+0000)
Subject: Build without HAVE_TLS
X-Git-Tag: OPENLDAP_REL_ENG_2_2_0ALPHA~104
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=9184d038ead9aeabff5b7c0bb2ed0d1e6bc95c8c;p=openldap

Build without HAVE_TLS
---

diff --git a/servers/slapd/slapi/slapi_utils.c b/servers/slapd/slapi/slapi_utils.c
index 6cd270f828..2f49c05555 100644
--- a/servers/slapd/slapi/slapi_utils.c
+++ b/servers/slapd/slapi/slapi_utils.c
@@ -2229,7 +2229,13 @@ static int initConnectionPB( Slapi_PBlock *pb, Connection *conn )
 		return rc;
 
 	/* Returns pointer to static string */
-	connAuthType = Authorization2AuthType( &conn->c_authz, conn->c_is_tls, 1 );
+	connAuthType = Authorization2AuthType( &conn->c_authz,
+#ifdef HAVE_TLS
+		conn->c_is_tls,
+#else
+		0,
+#endif
+		1 );
 	if ( connAuthType != NULL ) {
 		rc = slapi_pblock_set(pb, SLAPI_CONN_AUTHTYPE, (void *)connAuthType);
 		if ( rc != LDAP_SUCCESS )
@@ -2237,7 +2243,13 @@ static int initConnectionPB( Slapi_PBlock *pb, Connection *conn )
 	}
 
 	/* Returns pointer to allocated string */
-	connAuthType = Authorization2AuthType( &conn->c_authz, conn->c_is_tls, 0 );
+	connAuthType = Authorization2AuthType( &conn->c_authz,
+#ifdef HAVE_TLS
+		conn->c_is_tls,
+#else
+		0,
+#endif
+		0 );
 	if ( connAuthType != NULL ) {
 		rc = slapi_pblock_set(pb, SLAPI_CONN_AUTHMETHOD, (void *)connAuthType);
 		if ( rc != LDAP_SUCCESS )
@@ -2331,7 +2343,11 @@ int slapi_is_connection_ssl( Slapi_PBlock *pb, int *isSSL )
 	Connection *conn;
 
 	slapi_pblock_get( pb, SLAPI_CONNECTION, &conn );
+#ifdef HAVE_TLS
 	*isSSL = conn->c_is_tls;
+#else
+	*isSSL = 0;
+#endif
 
 	return LDAP_SUCCESS;
 #else