diff --git a/htdocs/conf/conf.php.example b/htdocs/conf/conf.php.example index 3e86d37a7a6..a5c315ee8a5 100644 --- a/htdocs/conf/conf.php.example +++ b/htdocs/conf/conf.php.example @@ -135,13 +135,14 @@ $character_set_client="ISO-8859-1"; # Parameters used to setup LDAP authentication. # Uncomment them if dolibarr_main_authentication = "ldap" # +# $dolibarr_main_auth_ldap_servertype="openldap"; # openldap, activedirectory or egroupware # $dolibarr_main_auth_ldap_login_attribute="loginfield"; # uid or samaccountname for active directory # $dolibarr_main_auth_ldap_host="127.0.0.1"; # $dolibarr_main_auth_ldap_port="389"; # $dolibarr_main_auth_ldap_version="3"; -# $dolibarr_main_auth_ldap_dn=""; # Ex: ou=users,dc=my-domain,dc=com -# $dolibarr_main_auth_ldap_admin_login=""; # Required only if anonymous bind disabled -# $dolibarr_main_auth_ldap_admin_pass=""; # Required only if anonymous bind disabled +# $dolibarr_main_auth_ldap_dn=""; # Ex: ou=users,dc=my-domain,dc=com +# $dolibarr_main_auth_ldap_admin_login=""; # Required only if anonymous bind disabled +# $dolibarr_main_auth_ldap_admin_pass=""; # Required only if anonymous bind disabled # $dolibarr_main_auth_ldap_debug="false"; diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php index 6e220697b67..4a8861aefbd 100644 --- a/htdocs/main.inc.php +++ b/htdocs/main.inc.php @@ -303,7 +303,8 @@ if (! isset($_SESSION["dol_login"])) } if (! $ldaphost) $ldaphost=$conf->global->LDAP_SERVER_HOST; if (! $ldapport) $ldapport=$conf->global->LDAP_SERVER_PORT; - if (! $ldapversion) $ldapversion=(int) $conf->global->LDAP_SERVER_PROTOCOLVERSION; + if (! $ldapservertype) $ldapservertype=$conf->global->LDAP_SERVER_TYPE; + if (! $ldapversion) $ldapversion=$conf->global->LDAP_SERVER_PROTOCOLVERSION; if (! $ldapdn) $ldapdn=$conf->global->LDAP_SERVER_DN; if (! $ldapadminlogin) $ldapadminlogin=$conf->global->LDAP_ADMIN_DN; if (! $ldapadminpass) $ldapadminpass=$conf->global->LDAP_ADMIN_PASS;