Fixed some typos in Kerberos Password handling

Added "dummy" SASL Class for Password storage
Removed nasty "remove Kerberos account" bug

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@5162 594d385d-05f5-0310-b6e9-bd551577e9d8

diff --git a/include/class_password-methods-kerberos.inc b/include/class_password-methods-kerberos.inc
index e66ebbba969bcaac9b6357ce52622b901ead0a53..4e8ff4862e93c258b8b2a50f91d96ebc4e86fa1a 100644 (file)
--- a/include/class_password-methods-kerberos.inc
+++ b/include/class_password-methods-kerberos.inc
@@ -53,7 +53,7 @@ class passwordMethodkerberos extends passwordMethod
                                print_red (_("Kerberos database communication failed!"));
                        }
 
-                       $ret= kadm5_chpass_principal($handle, $this->attrs['uid'][0]."@".$cfg['REALM'],$password);
+                       $ret= kadm5_chpass_principal($handle, $this->attrs['uid'][0]."@".$cfg['REALM'],$pwd);
 
                        if ($ret === FALSE)
                        {
@@ -69,5 +69,10 @@ class passwordMethodkerberos extends passwordMethod
        }
 }
 
+/* Dummy class for OpenLDAP Kerberos/SASL change  */
+class passwordMethodsasl extends passwordMethodkerberos
+{
+}
+
 // vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler:
 ?>

diff --git a/plugins/personal/generic/class_user.inc b/plugins/personal/generic/class_user.inc
index 81494949344e56736aa7e8507a5a1056c34f36dc..20f4f2f23d2ce90681a50a322b91936bfe9249f5 100644 (file)
--- a/plugins/personal/generic/class_user.inc
+++ b/plugins/personal/generic/class_user.inc
@@ -990,7 +990,7 @@ class user extends plugin
 
         /* Ok. User exists. Remove him/her when pw_storage has
            changed to be NOT kerberos. */
-        if ($this->pw_storage != "kerberos"){
+        if ($this->pw_storage != $this->config->current['KRBSASL']){
           $ret= kadm5_delete_principal ( $handle, $principal);
 
           if ($ret === FALSE){