From 4b0de2ed562c0217b0b1e27ee2e8817443ad4b42 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 24 Nov 2006 01:21:46 +0000 Subject: [PATCH] Modif pour connection via LDAP (marche pas encore) --- htdocs/main.inc.php | 24 ++++++++++-------------- 1 file changed, 10 insertions(+), 14 deletions(-) diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php index cf9ed244616..5f9942f0de2 100644 --- a/htdocs/main.inc.php +++ b/htdocs/main.inc.php @@ -71,6 +71,7 @@ $bc[1]="class=\"pair\""; // Exemple: array('ldap'); //$authmode=array('ldap'); $authmode=array('http','dolibarr'); +//$authmode=array('ldap'); if (isset($dolibarr_auto_user)) $authmode=array('auto'); // Si la demande du login a déjà eu lieu, on le récupère depuis la session @@ -155,27 +156,22 @@ if (! session_id() && ! isset($_SESSION["dol_user"]) && ! isset($_SESSION["dol_ // Authentification Apache KO ou non active, pas de mode force on demande le login require_once(DOL_DOCUMENT_ROOT."/includes/pear/Auth/Auth.php"); - //if ($conf->global->LDAP_SERVER_PROTOCOLVERSION == 3) - //{ - $ldap = 'ldap://'.$conf->global->LDAP_ADMIN_DN.':'.$conf->global->LDAP_ADMIN_PASS.'@'.$conf->global->LDAP_SERVER_HOST.':'.$conf->global->LDAP_SERVER_PORT.'/'.$conf->global->LDAP_SERVER_DN; - //} - //else - //{ - // $ldap = 'ldap2://'.$conf->global->LDAP_ADMIN_DN.':'.$conf->global->LDAP_ADMIN_PASS.'@'.$conf->global->LDAP_SERVER_HOST.':'.$conf->global->LDAP_SERVER_PORT.'/'.$conf->global->LDAP_SERVER_DN; - //} - + $ldapdebug=true; + if ($ldapdebug) print "DEBUG: Traces connexions LDAP
\n"; $params = array( - 'dsn' => $ldap, 'host' => $conf->global->LDAP_SERVER_HOST, 'port' => $conf->global->LDAP_SERVER_PORT, - 'version' => $conf->global->LDAP_SERVER_PORT, + 'version' => 3, 'basedn' => $conf->global->LDAP_SERVER_DN, 'binddn' => $conf->global->LDAP_ADMIN_DN, 'bindpw' => $conf->global->LDAP_ADMIN_PASS, - 'userattr' => $conf->global->LDAP_FIELD_LOGIN_SAMBA, - 'userfilter' => $conf->global->$conf->global->LDAP_FILTER_CONNECTION - //'userfilter' => '(objectClass=user)', + 'debug' => $ldapdebug, + +// 'userattr' => $conf->global->LDAP_FIELD_LOGIN_SAMBA + 'userattr' => $conf->global->LDAP_FIELD_LOGIN, +// 'userfilter' => $conf->global->LDAP_FILTER_CONNECTION + 'userfilter' => '' ); $aDol = new DOLIAuth("LDAP", $params, "dol_loginfunction");