gunnar: server/patches/horde-webmail/1.2.0 horde-webmail-1.2.0_kolab_openpkg.patch, 1.18, 1.19

[cvs at kolab.org]

Author: gunnar

Update of /kolabrepository/server/patches/horde-webmail/1.2.0
In directory doto:/tmp/cvs-serv27592/1.2.0

Modified Files:
	horde-webmail-1.2.0_kolab_openpkg.patch 
Log Message:
kolab/issue3309 (Can not login directly in to dimp) and a patch for a potential XSS issue.

Index: horde-webmail-1.2.0_kolab_openpkg.patch
===================================================================
RCS file: /kolabrepository/server/patches/horde-webmail/1.2.0/horde-webmail-1.2.0_kolab_openpkg.patch,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- horde-webmail-1.2.0_kolab_openpkg.patch	5 Dec 2008 16:06:07 -0000	1.18
+++ horde-webmail-1.2.0_kolab_openpkg.patch	15 Dec 2008 20:55:31 -0000	1.19
@@ -1,6 +1,6 @@
 diff -r 0a5153c325f0 config/conf.php
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/config/conf.php	Fri Dec 05 17:04:18 2008 +0100
++++ b/config/conf.php	Mon Dec 15 21:46:37 2008 +0100
 @@ -0,0 +1,119 @@
 +<?php
 +/* CONFIG START. DO NOT CHANGE ANYTHING IN OR AFTER THIS LINE. */
@@ -123,7 +123,7 @@
 +}
 diff -r 0a5153c325f0 config/conf.xml
 --- a/config/conf.xml	Fri Nov 14 08:35:22 2008 +0100
[...1002 lines suppressed...]
          }
  
@@ -12822,7 +13105,7 @@
          $result = $this->_store->save($attributes, $object_id);
 diff -r 0a5153c325f0 turba/lib/Driver/share.php
 --- a/turba/lib/Driver/share.php	Fri Nov 14 08:35:22 2008 +0100
-+++ b/turba/lib/Driver/share.php	Fri Dec 05 17:04:19 2008 +0100
++++ b/turba/lib/Driver/share.php	Mon Dec 15 21:46:38 2008 +0100
 @@ -145,7 +145,7 @@
      function _deleteAll($sourceName = null)
      {
@@ -12834,7 +13117,7 @@
      }
 diff -r 0a5153c325f0 turba/lib/Object.php
 --- a/turba/lib/Object.php	Fri Nov 14 08:35:22 2008 +0100
-+++ b/turba/lib/Object.php	Fri Dec 05 17:04:19 2008 +0100
++++ b/turba/lib/Object.php	Mon Dec 15 21:46:38 2008 +0100
 @@ -249,7 +249,10 @@
       */
      function addFile($info)