Removed Krb5 auth driver

diff --git a/framework/Auth/lib/Horde/Auth/Krb5.php b/framework/Auth/lib/Horde/Auth/Krb5.php
deleted file mode 100644 (file)
index a904688..0000000
--- a/framework/Auth/lib/Horde/Auth/Krb5.php
+++ /dev/null
@@ -1,72 +0,0 @@
-<?php
-/**
- * The Horde_Auth_Krb5 class provides an kerberos implementation of the Horde
- * authentication system.
- *
- * This driver requires the 'krb5' PHP extension to be loaded.
- * The module can be downloaded here:
- *   http://www.horde.org/download/php/phpkrb5.tar.gz
- *
- * Kerberos must be correctly configured on your system (e.g. /etc/krb5.conf)
- * for this class to work correctly.
- *
- * Copyright 2002-2010 The Horde Project (http://www.horde.org/)
- *
- * See the enclosed file COPYING for license information (LGPL). If you did
- * not receive this file, see http://opensource.org/licenses/lgpl-2.1.php
- *
- * @author  Michael Slusarz <slusarz@horde.org>
- * @package Horde_Auth
- */
-class Horde_Auth_Krb5 extends Horde_Auth_Base
-{
-    /**
-     * Constructor.
-     *
-     * @param array $params  Not used.
-     *
-     * @throws Horde_Auth_Exception
-     */
-    public function __construct($params = array())
-    {
-        if (!Horde_Util::extensionExists('krb5')) {
-            throw new Horde_Auth_Exception(_("Horde_Auth_Krb5: Required krb5 extension not found."));
-        }
-
-        parent::__construct($params);
-    }
-
-    /**
-     * Find out if a set of login credentials are valid.
-     *
-     * @param string $userId      The userId to check.
-     * @param array $credentials  An array of login credentials.
-     *                            For kerberos, this must contain a password
-     *                            entry.
-     *
-     * @throws Horde_Auth_Exception
-     */
-    protected function _authenticate($userId, $credentials)
-    {
-        if (empty($credentials['password'])) {
-            throw new Horde_Auth_Exception('', Horde_Auth::REASON_BADLOGIN);
-        }
-
-        $result = krb5_login($userId, $credentials['password']);
-
-        switch ($result) {
-        case KRB5_OK:
-            return;
-
-        case KRB5_BAD_PASSWORD:
-            throw new Horde_Auth_Exception(_("Bad kerberos password."));
-
-        case KRB5_BAD_USER:
-            throw new Horde_Auth_Exception(_("Bad kerberos username."));
-
-        default:
-            throw new Horde_Auth_Exception(_("Kerberos server rejected authentication."));
-        }
-    }
-
-}

diff --git a/framework/Auth/package.xml b/framework/Auth/package.xml
index db2039f..e18dae5 100644 (file)
--- a/framework/Auth/package.xml
+++ b/framework/Auth/package.xml
@@ -30,7 +30,8 @@ http://pear.php.net/dtd/package-2.0.xsd">
   <api>beta</api>
  </stability>
  <license uri="http://opensource.org/licenses/lgpl-2.1.php">LGPL</license>
- <notes>* Moved signup code to horde/Core.
+ <notes>* Removed Krb5 driver.
+ * Moved signup code to horde/Core.
  * Replaced Horde_Auth::addHook() and Horde_Auth::removeHook() with
  Horde_Auth::convertUsername().
  * Add ability to retrieve app-specific credentials via
@@ -61,7 +62,6 @@ http://pear.php.net/dtd/package-2.0.xsd">
       <file name="Imsp.php" role="php" />
       <file name="Ipbasic.php" role="php" />
       <file name="Kolab.php" role="php" />
-      <file name="Krb5.php" role="php" />
       <file name="Ldap.php" role="php" />
       <file name="Login.php" role="php" />
       <file name="Msad.php" role="php" />
@@ -171,7 +171,6 @@ http://pear.php.net/dtd/package-2.0.xsd">
    <install name="lib/Horde/Auth/Imsp.php" as="Horde/Auth/Imsp.php" />
    <install name="lib/Horde/Auth/Ipbasic.php" as="Horde/Auth/Ipbasic.php" />
    <install name="lib/Horde/Auth/Kolab.php" as="Horde/Auth/Kolab.php" />
-   <install name="lib/Horde/Auth/Krb5.php" as="Horde/Auth/Krb5.php" />
    <install name="lib/Horde/Auth/Ldap.php" as="Horde/Auth/Ldap.php" />
    <install name="lib/Horde/Auth/Login.php" as="Horde/Auth/Login.php" />
    <install name="lib/Horde/Auth/Msad.php" as="Horde/Auth/Msad.php" />

diff --git a/horde/config/conf.xml b/horde/config/conf.xml
index dd4b5b3..e7e3e97 100644 (file)
--- a/horde/config/conf.xml
+++ b/horde/config/conf.xml
@@ -299,8 +299,6 @@
      </configsection>
     </case>
 
-    <case name="krb5" desc="Kerberos authentication"/>
-
     <case name="kolab" desc="Kolab authentication">
      <configsection name="params">
       <configboolean name="login_block" desc="Should the login be