[pkg-kolab] r1482 - in kolab-webadmin/trunk/debian: . patches

[Mathieu Parent]

Author: sathieu
Date: 2010-01-16 14:30:36 +0000 (Sat, 16 Jan 2010)
New Revision: 1482

Added:
   kolab-webadmin/trunk/debian/patches/80-issue4025.diff
Modified:
   kolab-webadmin/trunk/debian/changelog
   kolab-webadmin/trunk/debian/patches/series
Log:
new 80-issue4025.diff: kolab/issue4025 (Users can not change their
password (in 2.2.3)). See also
http://kolab.org/security/kolab-vendor-notice-27.txt


Modified: kolab-webadmin/trunk/debian/changelog
===================================================================
--- kolab-webadmin/trunk/debian/changelog	2010-01-05 12:44:49 UTC (rev 1481)
+++ kolab-webadmin/trunk/debian/changelog	2010-01-16 14:30:36 UTC (rev 1482)
@@ -1,8 +1,11 @@
-kolab-webadmin (2.2.3-20091217-2) UNRELEASED; urgency=low
+kolab-webadmin (2.2.3-20091217-2) unstable; urgency=low
 
   * Add ${misc:Depends} to debian/control
+  * new 80-issue4025.diff: kolab/issue4025 (Users can not change their
+    password (in 2.2.3)). See also
+    http://kolab.org/security/kolab-vendor-notice-27.txt
 
- -- Mathieu Parent <sathieu at debian.org>  Tue, 05 Jan 2010 13:40:48 +0100
+ -- Mathieu Parent <sathieu at debian.org>  Sat, 16 Jan 2010 15:30:16 +0100
 
 kolab-webadmin (2.2.3-20091217-1) unstable; urgency=low
 

Added: kolab-webadmin/trunk/debian/patches/80-issue4025.diff
===================================================================
--- kolab-webadmin/trunk/debian/patches/80-issue4025.diff	                        (rev 0)
+++ kolab-webadmin/trunk/debian/patches/80-issue4025.diff	2010-01-16 14:30:36 UTC (rev 1482)
@@ -0,0 +1,41 @@
+Author: gunnar
+
+Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/user
+In directory doto:/tmp/cvs-serv13268/kolab-webadmin/kolab-webadmin/www/admin/user
+
+Modified Files:
+      Tag: kolab_2_2_branch
+	user.php.in 
+Log Message:
+kolab/issue4025 (Users can not change theire password (in 2.2.3))
+
+Index: user.php.in
+===================================================================
+RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/user/user.php.in,v
+retrieving revision 1.28.2.3
+retrieving revision 1.28.2.4
+diff -u -d -r1.28.2.3 -r1.28.2.4
+--- a/www/admin/user/user.php.in	7 Dec 2009 13:17:02 -0000	1.28.2.3
++++ b/www/admin/user/user.php.in	15 Jan 2010 15:32:33 -0000	1.28.2.4
+@@ -521,7 +521,9 @@
+   $entries['givenname']['comment'] = '';
+   $entries['sn']['comment'] = '';
+   $entries['alias']['attrs'] = 'readonly';
++  $entries['kolabdelegate']['attrs'] = 'readonly';
+   $entries['kolabhomeserver']['attrs'] = 'readonly';
++  $entries['kolabAllowSMTPRecipient']['attrs'] = 'readonly';
+   $entries['accttype']['attrs'] = 'readonly';
+   $entries['uid']['attrs'] = 'readonly';
+ }
+@@ -717,6 +719,8 @@
+ 			   unset($ldap_object['mail']);
+ 			   unset($ldap_object['uid']);
+ 			   unset($ldap_object['kolabHomeServer']);
++			   unset($ldap_object['kolabAllowSMTPRecipient']);
++			   unset($ldap_object['kolabDelegate']);
+ 			 }
+ 			 if (!ldap_modify($ldap->connection, $dn, $ldap_object)) {			   
+ 			   array_push($errors, sprintf(_("LDAP Error: Could not modify object %s: %s"), $dn,
+
+
+

Modified: kolab-webadmin/trunk/debian/patches/series
===================================================================
--- kolab-webadmin/trunk/debian/patches/series	2010-01-05 12:44:49 UTC (rev 1481)
+++ kolab-webadmin/trunk/debian/patches/series	2010-01-16 14:30:36 UTC (rev 1482)
@@ -1,2 +1,3 @@
 10-dist_conf.diff
 60-no_extra_doc.diff
+80-issue4025.diff