/* $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
struct berval ** rspdata,
LDAPControl ***rspctrls,
const char ** text,
- struct berval *** refs )
+ BerVarray * refs )
{
void *ctx;
int rc;
}
/* 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))
+ 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 our outstanding";
+ *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 != NULL ) )
+ ( conn->c_dn.bv_len != 0 ) )
{
*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_CTX, &ctx ) != 0
|| ctx == NULL)