User: miglius Branch: DRUPAL-6--1 Date: Mon, 04 May 2009 00:26:44 +0000 Modified files: /modules/ldap_integration ldapauth.admin.inc ldapauth.module ldapdata.admin.inc ldapdata.module ldapgroups.admin.inc ldapgroups.module Log message: ldap_integration: fixing ldap and drupal user conflict for a mixed mode, #445134 Links: http://cvs.drupal.org/diff.php?path=contributions/modules/ldap_integration/l... http://cvs.drupal.org/diff.php?path=contributions/modules/ldap_integration/l... http://cvs.drupal.org/diff.php?path=contributions/modules/ldap_integration/l... http://cvs.drupal.org/diff.php?path=contributions/modules/ldap_integration/l... http://cvs.drupal.org/diff.php?path=contributions/modules/ldap_integration/l... http://cvs.drupal.org/diff.php?path=contributions/modules/ldap_integration/l...