Fix entry_alloc with no attrs

[openldap] / servers / slapd / starttls.c

diff --git a/servers/slapd/starttls.c b/servers/slapd/starttls.c
index 11f2c0c917ead5a5a2eae31681d2fcb14c265508..3e26f5e2fbacc894dc932f22fbdbb1db85462a0f 100644 (file)
--- 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-2011 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 );
@@ -98,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)
         */