Project

General

Profile

Revision b42754b9

Added by Assos Assos almost 7 years ago

Weekly update of contrib modules

View differences:

drupal7/sites/all/modules/ldap/ldap_user/ldap_user.module
35 35
define('LDAP_USER_CONFLICT_RESOLVE', 2);
36 36
define('LDAP_USER_CONFLICT_RESOLVE_DEFAULT', 2);
37 37

  
38
// options for what to do if another Drupal account has the same email address
39
define('LDAP_USER_ACCOUNTS_WITH_SAME_EMAIL_DISABLED', 0);
40
define('LDAP_USER_ACCOUNTS_WITH_SAME_EMAIL_ENABLED', 1);
41

  
38 42
// options for dealing with manual account creation that conflict with ldap entries
39 43
define('LDAP_USER_MANUAL_ACCT_CONFLICT_REJECT', 1);
40 44
define('LDAP_USER_MANUAL_ACCT_CONFLICT_LDAP_ASSOCIATE', 2);

Also available in: Unified diff