Author: nkinder
Update of /cvs/dirsec/ldapserver/ldap/servers/slapd In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7223
Modified Files: saslbind.c Log Message: 184585 - Adjusted the location of the connection lock when doing a sasl_rebind
Index: saslbind.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/saslbind.c,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- saslbind.c 14 Mar 2006 19:18:03 -0000 1.15 +++ saslbind.c 14 Mar 2006 19:32:15 -0000 1.16 @@ -887,12 +887,12 @@ * mechanism changed in the middle of the SASL authentication * process. */ if ((pb->pb_conn->c_flags & CONN_FLAG_SASL_COMPLETE) || continuing) { - /* Lock the connection mutex */ - PR_Lock(pb->pb_conn->c_mutex); - /* reset flag */ pb->pb_conn->c_flags &= ~CONN_FLAG_SASL_COMPLETE;
+ /* Lock the connection mutex */ + PR_Lock(pb->pb_conn->c_mutex); + /* remove any SASL I/O from the connection */ sasl_io_cleanup(pb->pb_conn);