Merge remote-tracking branch 'origin/mdb.master'

[openldap] / libraries / libldap / cyrus.c

diff --git a/libraries/libldap/cyrus.c b/libraries/libldap/cyrus.c
index 2e2ef95f40d237be9c4d16a47dbd65151728ac7a..2475a87b13c82648bffd8d06863302669b5dd3fb 100644 (file)
--- a/libraries/libldap/cyrus.c
+++ b/libraries/libldap/cyrus.c
@@ -1,7 +1,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1998-2011 The OpenLDAP Foundation.
+ * Copyright 1998-2012 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -419,7 +419,7 @@ ldap_int_sasl_bind(
                LDAP_MUTEX_LOCK( &ld->ld_conn_mutex );
                ber_sockbuf_ctrl( ld->ld_sb, LBER_SB_OPT_GET_FD, &sd );
 
-               if ( sd == AC_SOCKET_INVALID ) {
+               if ( sd == AC_SOCKET_INVALID || !ld->ld_defconn ) {
                        /* not connected yet */
 
                        rc = ldap_open_defconn( ld );