upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-12-24 00:29:35 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

reorder tests

Browse source
This commit is contained in:
Kurt Zeilenga 2000-08-30 22:24:21 +00:00
parent e3a5562089
commit 563fd083e9
1 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
servers/slapd/starttls.c
View file

@ -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;