Fix prev commit, return generated passwd

[openldap] / servers / slapd / connection.c

diff --git a/servers/slapd/connection.c b/servers/slapd/connection.c
index 028ee4aa4f092e347357b9b477f7d2ad9b25b69a..da5b9ec43ebf247e1faaaccfd45ffe4a2fc1c10a 100644 (file)
--- a/servers/slapd/connection.c
+++ b/servers/slapd/connection.c
@@ -1,7 +1,26 @@
 /* $OpenLDAP$ */
-/*
- * Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved.
- * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 1998-2003 The OpenLDAP Foundation.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted only as authorized by the OpenLDAP
+ * Public License.
+ *
+ * A copy of this license is available in the file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * <http://www.OpenLDAP.org/license.html>.
+ */
+/* Portions Copyright (c) 1995 Regents of the University of Michigan.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that this notice is preserved and that due credit is given
+ * to the University of Michigan at Ann Arbor. The name of the University
+ * may not be used to endorse or promote products derived from this
+ * software without specific prior written permission. This software
+ * is provided ``as is'' without express or implied warranty.
  */
 
 #include "portable.h"
@@ -502,6 +521,7 @@ long connection_init(
        assert( c->c_sasl_extra == NULL );
        assert( c->c_sasl_bindop == NULL );
        assert( c->c_currentber == NULL );
+       assert( c->c_writewaiter == 0);
 
        c->c_listener = listener;
 
@@ -525,7 +545,6 @@ long connection_init(
        c->c_n_get = 0;
        c->c_n_read = 0;
        c->c_n_write = 0;
-       c->c_writewaiter = 0;
 
        /* set to zero until bind, implies LDAP_VERSION3 */
        c->c_protocol = 0;
@@ -651,6 +670,7 @@ connection_destroy( Connection *c )
        assert( c->c_struct_state != SLAP_C_UNUSED );
        assert( c->c_conn_state != SLAP_C_INVALID );
        assert( LDAP_STAILQ_EMPTY(&c->c_ops) );
+       assert( c->c_writewaiter == 0);
 
        /* only for stats (print -1 as "%lu" may give unexpected results ;) */
        connid = c->c_connid;
@@ -1119,8 +1139,6 @@ operations_error:
                conn->c_n_ops_completed++;
        }
 
-no_co_op_free:
-
        switch( tag ) {
        case LBER_ERROR:
        case LDAP_REQ_UNBIND: