X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=include%2Fclass_password-methods-kerberos.inc;h=2023f6c84953403ef6328316607778b7b29febd4;hb=358776d4794e2be413822b2e79aefe3f274dbe18;hp=e66ebbba969bcaac9b6357ce52622b901ead0a53;hpb=caba19c58e65e10464ba6420802b4e5229c81173;p=gosa.git

diff --git a/include/class_password-methods-kerberos.inc b/include/class_password-methods-kerberos.inc
index e66ebbba9..2023f6c84 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)
 			{
@@ -62,12 +62,17 @@ class passwordMethodkerberos extends passwordMethod
 
 			kadm5_destroy($handle);
 
-			$newpass= "{kerberos}".$this->attrs['uid'][0]."@".$cfg['REALM'];
+			$newpass= "{".$this->config->current['KRBSASL']."}".$this->attrs['uid'][0]."@".$cfg['REALM'];
 
 			return $newpass;       
 		}
 	}
 }
 
+/* Dummy class for OpenLDAP Kerberos/SASL change  */
+class passwordMethodsasl extends passwordMethodkerberos
+{
+}
+
 // vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler:
 ?>