From: scheiter <scheiter@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Mon, 20 Nov 2006 10:43:52 +0000 (+0000)
Subject: Fixed some typos in Kerberos Password handling
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=8b8c82c2aa3941a1d7cff3bf600ae847c479ce38;p=gosa.git

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 e66ebbba9..4e8ff4862 100644
--- 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 814949493..20f4f2f23 100644
--- 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){