Index: ../contrib/ldap_integration/ldapauth.module
===================================================================
--- ../contrib/ldap_integration/ldapauth.module (revision 3162)
+++ ../contrib/ldap_integration/ldapauth.module (working copy)
@@ -436,7 +436,12 @@
   $login_name = ($code = _ldapauth_ldap_info($_ldapauth_ldap->getOption('sid'), 'login_php')) ? eval($code) : $name;
 
   // If there is no bindn and bindpw - the connect will be an anonymous connect.
-  $_ldapauth_ldap->connect($_ldapauth_ldap->getOption('binddn'), $_ldapauth_ldap->getOption('bindpw'));
+  // OMN.RC: On error do NOT bother searching, this can lead to segfaults
+  $is_ok = $_ldapauth_ldap->connect($_ldapauth_ldap->getOption('binddn'), $_ldapauth_ldap->getOption('bindpw'));
+  if (! $is_ok) {
+    return;
+  }
+
   foreach (explode("\r\n", $_ldapauth_ldap->getOption('basedn')) as $base_dn) {
     if (empty($base_dn))
       continue;
Index: ../contrib/ldap_integration/includes/LDAPInterface.inc
===================================================================
--- ../contrib/ldap_integration/includes/LDAPInterface.inc  (revision 3162)
+++ ../contrib/ldap_integration/includes/LDAPInterface.inc  (working copy)
@@ -161,6 +161,8 @@
 
   function connectAndBind($dn = '', $pass = '') {
     $this->initConnection();
+    // OMN.RC : Per http://drupal.org/node/552708 to support TLS
+    putenv('APTLS_REQCERT=never') or die('Failed to setup the env');
 
     $con = $this->connection;
     if (!$this->bind($dn, $pass)) {