reorder tests

diff --git a/servers/slapd/starttls.c b/servers/slapd/starttls.c
index f59f15adb41969e903cfe149a3fbaadf4d2558d8..bd12f32c73d0be0c140d9c0b4cd10dad23ce2ef5 100644 (file)
--- a/servers/slapd/starttls.c
+++ b/servers/slapd/starttls.c
@@ -49,6 +49,16 @@ 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;
+       }
+
        /* fail if TLS could not be initialized */
        if (ldap_pvt_tls_get_option(NULL, LDAP_OPT_X_TLS_CERT, &ctx) != 0
                || ctx == NULL)
@@ -64,16 +74,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;