X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;ds=inline;f=servers%2Fslapd%2Fstarttls.c;h=3e26f5e2fbacc894dc932f22fbdbb1db85462a0f;hb=473e2c997f6b1f226d35da186db8033c922001f3;hp=cafafa8ff8afc2601ec000ffd2bfb4846957cb6c;hpb=4e15a84452f0493b1b5bc7b779c7bd1cd4fa4b73;p=openldap
diff --git a/servers/slapd/starttls.c b/servers/slapd/starttls.c
index cafafa8ff8..3e26f5e2fb 100644
--- a/servers/slapd/starttls.c
+++ b/servers/slapd/starttls.c
@@ -1,7 +1,7 @@
/* $OpenLDAP$ */
/* This work is part of OpenLDAP Software .
*
- * Copyright 1998-2003 The OpenLDAP Foundation.
+ * Copyright 1998-2011 The OpenLDAP Foundation.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -17,19 +17,22 @@
#include
#include
-
-#include
+#include
#include "slap.h"
+#include "lber_pvt.h"
-#ifdef HAVE_TLS
+const struct berval slap_EXOP_START_TLS = BER_BVC(LDAP_EXOP_START_TLS);
+#ifdef HAVE_TLS
int
starttls_extop ( Operation *op, SlapReply *rs )
{
- void *ctx;
int rc;
+ Statslog( LDAP_DEBUG_STATS, "%s STARTTLS\n",
+ op->o_log_prefix, 0, 0, 0, 0 );
+
if ( op->ore_reqdata != NULL ) {
/* no request data should be provided */
rs->sr_text = "no request data expected";
@@ -61,8 +64,8 @@ starttls_extop ( Operation *op, SlapReply *rs )
( op->o_conn->c_dn.bv_len != 0 ) )
{
Statslog( LDAP_DEBUG_STATS,
- "conn=%lu op=%lu AUTHZ anonymous mech=starttls ssf=0\n",
- op->o_connid, op->o_opid, 0, 0, 0 );
+ "%s AUTHZ anonymous mech=starttls ssf=0\n",
+ op->o_log_prefix, 0, 0, 0, 0 );
/* force to anonymous */
connection2anonymous( op->o_conn );
@@ -77,9 +80,7 @@ starttls_extop ( Operation *op, SlapReply *rs )
}
/* fail if TLS could not be initialized */
- if (ldap_pvt_tls_get_option( NULL, LDAP_OPT_X_TLS_CTX, &ctx ) != 0
- || ctx == NULL)
- {
+ if ( slap_tls_ctx == NULL ) {
if (default_referral != NULL) {
/* caller will put the referral in the result */
rc = LDAP_REFERRAL;
@@ -100,8 +101,7 @@ done:
/* give up connection lock */
ldap_pvt_thread_mutex_unlock( &op->o_conn->c_mutex );
- /*
- * RACE CONDITION: we give up lock before sending result
+ /* FIXME: RACE CONDITION! we give up lock before sending result
* Should be resolved by reworking connection state, not
* by moving send here (so as to ensure proper TLS sequencing)
*/