X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fstarttls.c;h=5f985d2007ea566671bbe7566d5bcd0407342ac1;hb=925714ceeff035c596ad3d3c899ff631986c6757;hp=b607c68ef70431606d2edd6f1473a2f4f25b8576;hpb=60802201e3a39b0a46bfa7156c608026f7d361ba;p=openldap

diff --git a/servers/slapd/starttls.c b/servers/slapd/starttls.c
index b607c68ef7..5f985d2007 100644
--- a/servers/slapd/starttls.c
+++ b/servers/slapd/starttls.c
@@ -1,6 +1,6 @@
 /* $OpenLDAP$ */
 /* 
- * Copyright 1999-2000 The OpenLDAP Foundation.
+ * Copyright 1999-2002 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms are permitted only
@@ -14,13 +14,14 @@
 #include <stdio.h>
 #include <ac/socket.h>
 
+#include <ldap_pvt.h>
+
 #include "slap.h"
 
 #ifdef HAVE_TLS
 
 int
 starttls_extop (
-	SLAP_EXTOP_CALLBACK_FN cb,
 	Connection *conn,
 	Operation *op,
 	const char * reqoid,
@@ -29,7 +30,7 @@ starttls_extop (
 	struct berval ** rspdata,
 	LDAPControl ***rspctrls,
 	const char ** text,
-	struct berval *** refs )
+	BerVarray * refs )
 {
 	void *ctx;
 	int rc;
@@ -50,8 +51,34 @@ starttls_extop (
 		goto done;
 	}
 
+	/* can't start TLS if there are other op's around */
+	if (( !LDAP_STAILQ_EMPTY(&conn->c_ops) &&
+			(LDAP_STAILQ_FIRST(&conn->c_ops) != op ||
+			LDAP_STAILQ_NEXT(op, o_next) != NULL)) ||
+		( !LDAP_STAILQ_EMPTY(&conn->c_pending_ops) ))
+	{
+		*text = "cannot start TLS when operations are outstanding";
+		rc = LDAP_OPERATIONS_ERROR;
+		goto done;
+	}
+
+	if ( !( global_disallows & SLAP_DISALLOW_TLS_2_ANON ) &&
+		( conn->c_dn.bv_len != 0 ) )
+	{
+		/* force to anonymous */
+		connection2anonymous( conn );
+	}
+
+	if ( ( global_disallows & SLAP_DISALLOW_TLS_AUTHC ) &&
+		( conn->c_dn.bv_len != 0 ) )
+	{
+		*text = "cannot start TLS after authentication";
+		rc = LDAP_OPERATIONS_ERROR;
+		goto done;
+	}
+
 	/* fail if TLS could not be initialized */
-	if (ldap_pvt_tls_get_option(NULL, LDAP_OPT_X_TLS_CERT, &ctx) != 0
+	if (ldap_pvt_tls_get_option( NULL, LDAP_OPT_X_TLS_CTX, &ctx ) != 0
 		|| ctx == NULL)
 	{
 		if (default_referral != NULL) {
@@ -65,16 +92,6 @@ starttls_extop (
 		goto done;
 	}
 
-	/* can't start TLS if there are other op's around */
-	if (( conn->c_ops != NULL &&
-			(conn->c_ops != op || op->o_next != NULL)) ||
-		( conn->c_pending_ops != NULL))
-	{
-		*text = "cannot start TLS when operations our outstanding";
-		rc = LDAP_OPERATIONS_ERROR;
-		goto done;
-	}
-
     conn->c_is_tls = 1;
     conn->c_needs_tls_accept = 1;