X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fstarttls.c;h=edc7a3ff8a759859b31abc4c6e45e3f0cd271c68;hb=3cdba151ad18dba10786fde4464442ddaf67b5fe;hp=5ed9c5b5ac92bd77d26712bab99747c2cdf36bd8;hpb=e2f2186aa023c7d48e2556c76e98acf9ec526bc7;p=openldap

diff --git a/servers/slapd/starttls.c b/servers/slapd/starttls.c
index 5ed9c5b5ac..edc7a3ff8a 100644
--- a/servers/slapd/starttls.c
+++ b/servers/slapd/starttls.c
@@ -1,7 +1,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1998-2004 The OpenLDAP Foundation.
+ * Copyright 1998-2007 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -17,19 +17,22 @@
 
 #include <stdio.h>
 #include <ac/socket.h>
-
-#include <ldap_pvt.h>
+#include <ac/string.h>
 
 #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 );