Plug mutex/rwlock leaks (destroy them)

[openldap] / servers / slapd / connection.c

diff --git a/servers/slapd/connection.c b/servers/slapd/connection.c
index 80edfb0fd0685d7c56546d412d3e009e6dfea79a..83bed4e9495f57b246d02dc09a10288c0afe5cba 100644 (file)
--- a/servers/slapd/connection.c
+++ b/servers/slapd/connection.c
@@ -1,7 +1,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1998-2009 The OpenLDAP Foundation.
+ * Copyright 1998-2010 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -39,6 +39,10 @@
 #include "lutil.h"
 #include "slap.h"
 
+#ifdef LDAP_CONNECTIONLESS
+#include "../../libraries/liblber/lber-int.h"  /* ber_int_sb_read() */
+#endif
+
 #ifdef LDAP_SLAPI
 #include "slapi/slapi.h"
 #endif
@@ -48,28 +52,10 @@ static ldap_pvt_thread_mutex_t connections_mutex;
 static Connection *connections = NULL;
 
 static ldap_pvt_thread_mutex_t conn_nextid_mutex;
-static unsigned long conn_nextid = 0;
+static unsigned long conn_nextid = SLAPD_SYNC_SYNCCONN_OFFSET;
 
 static const char conn_lost_str[] = "connection lost";
 
-/* structure state (protected by connections_mutex) */
-enum sc_struct_state {
-       SLAP_C_UNINITIALIZED = 0,       /* MUST BE ZERO (0) */
-       SLAP_C_UNUSED,
-       SLAP_C_USED,
-       SLAP_C_PENDING
-};
-
-/* connection state (protected by c_mutex ) */
-enum sc_conn_state {
-       SLAP_C_INVALID = 0,             /* MUST BE ZERO (0) */
-       SLAP_C_INACTIVE,                /* zero threads */
-       SLAP_C_CLOSING,                 /* closing */
-       SLAP_C_ACTIVE,                  /* one or more threads */
-       SLAP_C_BINDING,                 /* binding */
-       SLAP_C_CLIENT                   /* outbound client conn */
-};
-
 const char *
 connection_state2str( int state )
 {
@@ -1380,8 +1366,8 @@ connection_read( ber_socket_t s, conn_readinfo *cri )
                            c->c_connid, (int) s, c->c_tls_ssf, c->c_ssf, 0 );
                        slap_sasl_external( c, c->c_tls_ssf, &authid );
                        if ( authid.bv_val ) free( authid.bv_val );
-               } else if ( rc == 1 ) { /* need to retry */
-                       slapd_set_read( s, 0 );
+               } else if ( rc == 1 && ber_sockbuf_ctrl( c->c_sb,
+                       LBER_SB_OPT_NEEDS_WRITE, NULL )) {      /* need to retry */
                        slapd_set_write( s, 1 );
                        connection_return( c );
                        return 0;