gunnar: server/kolab-webclient/imp/configuration/imp-4.3.6 10-kolab_servers_base.php, 1.1, 1.2

[cvs at kolab.org]

Author: gunnar

Update of /kolabrepository/server/kolab-webclient/imp/configuration/imp-4.3.6
In directory doto:/tmp/cvs-serv29232/imp/configuration/imp-4.3.6

Modified Files:
	10-kolab_servers_base.php 
Log Message:
Merged configuration patch.

Index: 10-kolab_servers_base.php
===================================================================
RCS file: /kolabrepository/server/kolab-webclient/imp/configuration/imp-4.3.6/10-kolab_servers_base.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- 10-kolab_servers_base.php	18 Jan 2010 17:44:22 -0000	1.1
+++ 10-kolab_servers_base.php	22 Jan 2010 07:56:30 -0000	1.2
@@ -38,7 +38,7 @@
     $imapParams = array(
         'hostspec' => $server,
         'port'     => $GLOBALS['conf']['kolab']['imap']['port'],
-        'protocol' => $GLOBALS['conf']['auth']['params']['protocol']
+        'protocol' => 'imap/novalidate-cert'
     );
  }
 
@@ -58,4 +58,5 @@
     'acl'        => array(
         'driver' => 'rfc2086',
     ),
+    'login_tries' => 1,
 );