/* $OpenLDAP$ */
/*
- * Copyright 1999 The OpenLDAP Foundation.
+ * Copyright 1999-2002 The OpenLDAP Foundation.
* All rights reserved.
*
* Redistribution and use in source and binary forms are permitted only
#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,
- char * reqoid,
+ const char * reqoid,
struct berval * reqdata,
char ** rspoid,
struct berval ** rspdata,
LDAPControl ***rspctrls,
- char ** text,
- struct berval *** refs )
+ const char ** text,
+ BerVarray * refs )
{
void *ctx;
int rc;
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) {
- /* caller will put the referral into the result */
+ /* caller will put the referral in the result */
rc = LDAP_REFERRAL;
goto done;
}
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;