diff options
author | Ermal Luçi <eri@pfsense.org> | 2010-03-03 16:16:39 +0000 |
---|---|---|
committer | Ermal Luçi <eri@pfsense.org> | 2010-03-03 16:17:35 +0000 |
commit | 6306b5ddc70ce5bbcf9c9c9769755340e0117de4 (patch) | |
tree | ef8ac81995fa89cde3362ccbc02540a4e468b783 /etc/inc/authgui.inc | |
parent | f700f8da9deedb1f866353911a5eaf939016124a (diff) | |
download | pfsense-6306b5ddc70ce5bbcf9c9c9769755340e0117de4.zip pfsense-6306b5ddc70ce5bbcf9c9c9769755340e0117de4.tar.gz |
Overhaul the user login system to use the Servers tab as its base.
Fix quite a few problems down the way.
Diffstat (limited to 'etc/inc/authgui.inc')
-rw-r--r-- | etc/inc/authgui.inc | 31 |
1 files changed, 3 insertions, 28 deletions
diff --git a/etc/inc/authgui.inc b/etc/inc/authgui.inc index 3f7c216..b3cd6a6 100644 --- a/etc/inc/authgui.inc +++ b/etc/inc/authgui.inc @@ -38,38 +38,13 @@ */ include_once("auth.inc"); -include_once("priv.defs.inc"); include_once("priv.inc"); -/* We only support htpasswd backed HTTP Basic auth and session - * based backing methods at the moment. - * session_auth - this will use session based authentication and timeout - * htpasswd_backed - this uses the "standard" .htpasswd file - * passwd_backed - this will use the system passwd file in /etc - * radius_backed - this will allow you to use a radius server - * pam_backed - this uses the system's PAM facility .htpasswd file - */ - -//log_error("debug: FILE_NAME = {$_SERVER['REQUEST_URI']}"); -//log_error("debug: FILE_NAME = {$_SERVER['SCRIPT_FILENAME']}"); -//log_error("debug: SCRIPT_NAME = {$_SERVER['SCRIPT_NAME']}"); - -/* enable correct auth backend, default to htpasswd_backed */ -$ldapcase = $config['system']['webgui']['backend']; -switch($ldapcase) { - case ldap: - $backing_method="ldap_backed"; - break; - case ldapother: - $backing_method="ldap_backed"; - break; - default: - $backing_method="local_backed"; -} - /* Authenticate user - exit if failed */ -if (!session_auth($backing_method)) +if (!session_auth()) { + display_login_form(); exit; +} /* * Once here, the user has authenticated with the web server. |