From c5d168e1e74360c4a1275becbbf614208ea9df80 Mon Sep 17 00:00:00 2001 From: scheiter Date: Mon, 20 Nov 2006 10:39:28 +0000 Subject: [PATCH] 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/branches/2.5@5161 594d385d-05f5-0310-b6e9-bd551577e9d8 --- include/class_password-methods-kerberos.inc | 7 ++++++- plugins/personal/generic/class_user.inc | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/include/class_password-methods-kerberos.inc b/include/class_password-methods-kerberos.inc index 03d935ac6..2f3173bf3 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'],$wd); 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 4117aee96..e7c13fefd 100644 --- a/plugins/personal/generic/class_user.inc +++ b/plugins/personal/generic/class_user.inc @@ -947,7 +947,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){ -- 2.30.2