X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fstarttls.c;h=e8170ad69056d1115a21482d181073aa318b6566;hb=4a107089d82ecdaca788fc6ecdef34d3d4fc19df;hp=11f2c0c917ead5a5a2eae31681d2fcb14c265508;hpb=248e73c7e100d9245e9321a755592fd6a233b13b;p=openldap
diff --git a/servers/slapd/starttls.c b/servers/slapd/starttls.c
index 11f2c0c917..e8170ad690 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-2004 The OpenLDAP Foundation.
+ * Copyright 1998-2005 The OpenLDAP Foundation.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -18,8 +18,6 @@
#include
#include
-#include
-
#include "slap.h"
#ifdef HAVE_TLS
@@ -61,8 +59,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 );
@@ -98,8 +96,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)
*/