From fbdd4848a8e6383878c9277605b75a1cdc633dc7 Mon Sep 17 00:00:00 2001 From: cajus Date: Tue, 16 Sep 2008 14:48:25 +0000 Subject: [PATCH] Fixed login errors git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@12486 594d385d-05f5-0310-b6e9-bd551577e9d8 --- gosa-core/html/index.php | 4 ++-- gosa-core/include/functions.inc | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gosa-core/html/index.php b/gosa-core/html/index.php index 1330e97b9..11c11c6a4 100644 --- a/gosa-core/html/index.php +++ b/gosa-core/html/index.php @@ -269,8 +269,8 @@ if (($_SERVER["REQUEST_METHOD"] == "POST" && isset($_POST['login'])) || $htacces exit() ; }else{ $cfg = array(); - $cfg['admin'] = $config->current['ADMIN']; - $cfg['password'] = $config->current['PASSWORD']; + $cfg['admin'] = $config->current['ADMINDN']; + $cfg['password'] = $config->current['ADMINPASSWORD']; $cfg['connection']= $config->current['SERVER']; $cfg['tls'] = $tls; $str = check_schema($cfg, $config->get_cfg_value("rfc2307bis") == "true"); diff --git a/gosa-core/include/functions.inc b/gosa-core/include/functions.inc index 8d40ad580..d35693d6b 100644 --- a/gosa-core/include/functions.inc +++ b/gosa-core/include/functions.inc @@ -2234,7 +2234,7 @@ function check_schema($cfg,$rfc2307bis = FALSE) $messages= array(); /* Get objectclasses */ - $ldap = new ldapMultiplexer(new LDAP($cfg['admin'],$cfg['password'],$cfg['connection'] ,FALSE,$cfg['LDAPTLS'])); + $ldap = new ldapMultiplexer(new LDAP($cfg['admin'],$cfg['password'],$cfg['connection'] ,FALSE, $cfg['tls'])); $objectclasses = $ldap->get_objectclasses(); if(count($objectclasses) == 0){ msg_dialog::display(_("LDAP warning"), _("Cannot get schema information from server. No schema check possible!"), WARNING_DIALOG); -- 2.30.2