An incremental step.

[openldap] / servers / slapd / starttls.c

diff --git a/servers/slapd/starttls.c b/servers/slapd/starttls.c
index b607c68ef70431606d2edd6f1473a2f4f25b8576..b5582e765254f2b22f38f0386dea1bdc53dae7d4 100644 (file)
--- a/servers/slapd/starttls.c
+++ b/servers/slapd/starttls.c
@@ -20,7 +20,6 @@
 
 int
 starttls_extop (
-       SLAP_EXTOP_CALLBACK_FN cb,
        Connection *conn,
        Operation *op,
        const char * reqoid,
@@ -50,8 +49,33 @@ 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;
+       }
+
+       if ( ( global_disallows & SLAP_DISALLOW_TLS_AUTHC ) &&
+               ( conn->c_dn != NULL ) )
+       {
+               *text = "cannot start TLS after authentication";
+               rc = LDAP_OPERATIONS_ERROR;
+               goto done;
+       }
+
+       if ( ( global_allows & SLAP_ALLOW_TLS_2_ANON ) &&
+               ( conn->c_dn != NULL ) )
+       {
+               /* force to anonymous */
+               connection2anonymous( conn );
+       }
+
        /* 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 +89,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;