From 3e8df79c8c74d06955d7d12009aa8b27c9a85416 Mon Sep 17 00:00:00 2001 From: Nikolai Kristiansen Date: Thu, 3 May 2012 02:12:50 +0200 Subject: [PATCH] Deploy fixes --- includes/Ldap_defines.php | 4 ++-- inside/ldap.php | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/includes/Ldap_defines.php b/includes/Ldap_defines.php index cdb1efa..edbcd5d 100644 --- a/includes/Ldap_defines.php +++ b/includes/Ldap_defines.php @@ -39,8 +39,8 @@ define("RADIUS_MYSQL_HOST", "snes.neuf.no"); define("RADIUS_MYSQL_USER", apache_getenv("RADIUS_MYSQL_USER")); define("RADIUS_MYSQL_PASS", apache_getenv("RADIUS_MYSQL_PASS")); -define("LDAP_ENABLED", false); -define("LDAP_SERVER", "macgyver.neuf.no"); +define("LDAP_ENABLED", true); +define("LDAP_SERVER", "pacman.neuf.no"); $api_keys = array(); $api_keys[] = apache_getenv("API_KEY1"); diff --git a/inside/ldap.php b/inside/ldap.php index fd7121d..67a12b6 100644 --- a/inside/ldap.php +++ b/inside/ldap.php @@ -67,6 +67,7 @@ function ldap_login($username, $password, $db) { return $legacy_uid; } +/* TODO exception handling */ function ldap_get_user($username_or_email, $db) { if( is_mail($username_or_email) && $db->mailExists($username_or_email) ) { return $db->getUserWithMail($username_or_email);