[debian-edu-commits] debian-edu/pkg-team/ 21/32: Imported Debian patch 2.7.4-4.4

[Mike Gabriel]

This is an automated email from the git hooks/post-receive script.

sunweaver pushed a commit to branch master
in repository gosa.

commit c59de1cd63c2a7691c1de863bcbee19bbdde7048
Author: Michael Banck <mbanck at debian.org>
Date:   Mon Dec 2 12:37:29 2013 +0100

    Imported Debian patch 2.7.4-4.4
---
 debian/changelog                          |  8 ++++++++
 debian/patches/sasl-password-change.patch | 34 +++++++++++++++++++++++++++++++
 debian/patches/series                     |  1 +
 3 files changed, 43 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 713d7e5..595bc90 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+gosa (2.7.4-4.4) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * debian/patches/sasl-password-change.patch: New patch, allows for changing
+    user passwords as admin for sasl authentication method. (Closes: #698544)
+
+ -- Michael Banck <mbanck at debian.org>  Mon, 02 Dec 2013 12:37:29 +0100
+
 gosa (2.7.4-4.3) unstable; urgency=low
 
   * Non-maintainer upload.
diff --git a/debian/patches/sasl-password-change.patch b/debian/patches/sasl-password-change.patch
new file mode 100644
index 0000000..6311dbb
--- /dev/null
+++ b/debian/patches/sasl-password-change.patch
@@ -0,0 +1,34 @@
+diff -ur gosa.orig/include/password-methods/class_password-methods-sasl.inc gosa/include/password-methods/class_password-methods-sasl.inc
+--- ./gosa-core/include/password-methods/class_password-methods-sasl.inc	2012-05-02 11:49:53.000000000 +0200
++++ ./gosa-core/include/password-methods/class_password-methods-sasl.inc	2013-11-24 14:32:29.354960467 +0100
+@@ -42,8 +42,6 @@
+     if($ldap->count() == 1){
+         $attrs = $ldap->fetch();
+         $this->uid = $attrs['uid'][0];
+-    }else{
+-        trigger_error("Cannot change password, unknown users '".$dn."'");
+     }
+   }
+ 
+diff -ur gosa.orig/plugins/admin/users/class_userManagement.inc gosa/plugins/admin/users/class_userManagement.inc
+--- ./gosa-core/plugins/admin/users/class_userManagement.inc	2012-05-04 17:08:16.000000000 +0200
++++ ./gosa-core/plugins/admin/users/class_userManagement.inc	2013-11-24 14:38:46.563804917 +0100
+@@ -279,18 +279,6 @@
+             $this->proposalSelected = ($this->proposal != "");
+             $this->dn = array_pop($this->pwd_change_queue);
+ 
+-            // Do not allow to modify SASL passwords for this customer
+-            $ldap = $this->config->get_ldap_link();
+-            $ldap->cat($this->dn, array('uid', 'userPassword'));
+-            $attrs = $ldap->fetch();
+-            $hasSasl = isset($attrs['userPassword'][0]) && preg_match("/^{SASL}/i", $attrs['userPassword'][0]);
+-            $getsSasl= !isset($this->force_hash_type[$this->dn]) || $this->force_hash_type[$this->dn] == "sasl";
+-            if($getsSasl && $hasSasl){
+-                $this->dn = "";
+-                $this->handlePasswordQueue();
+-                return;
+-            }
+-
+             // Check if we are able to enforce a password change
+             $ldap = $this->config->get_ldap_link();
+             $ldap->cd($this->config->current['BASE']);
diff --git a/debian/patches/series b/debian/patches/series
index 8aa9428..9bfcf1b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,3 +6,4 @@ style-robustness.patch
 04_fix_locale_location.patch
 no-image-warning.patch
 fix-mass-ldapimport.patch
+sasl-password-change.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/pkg-team/gosa.git