steffen: server/kolab/kolab kolab_bootstrap, 1.23, 1.24 main.cf.template, 1.11, 1.12

[cvs at intevation.de]

Author: steffen

Update of /kolabrepository/server/kolab/kolab
In directory doto:/tmp/cvs-serv5780/kolab

Modified Files:
	kolab_bootstrap main.cf.template 
Log Message:
bugfix + ldap uri in postfix maps

Index: kolab_bootstrap
===================================================================
RCS file: /kolabrepository/server/kolab/kolab/kolab_bootstrap,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- kolab_bootstrap	24 May 2004 23:57:23 -0000	1.23
+++ kolab_bootstrap	25 May 2004 00:19:19 -0000	1.24
@@ -380,7 +380,7 @@
       goto SLAVESTART;
     }
     $php_dn = "cn=nobody,$base_dn";
-    $mesg = $ldap->search(base=> $php_dn, scope=> 'exact', filter=> "(objectclass=*)");
+    my $mesg = $ldap->search(base=> $php_dn, scope=> 'exact', filter=> "(objectclass=*)");
     if ($mesg && $mesg->count != 1) {
       print "Nobody object found, please check your input\n";
       goto SLAVESTART;
@@ -404,7 +404,7 @@
     print "Updating configuration, please ignore any initial errors from kolabconf\n\n";
     system("$kolab_prefix/sbin/kolabconf");
   } else {
-    die "Error contacting LDAP server: ".$mesg->error."\n";
+    die "Error contacting LDAP server\n";
   }
 }
 

Index: main.cf.template
===================================================================
RCS file: /kolabrepository/server/kolab/kolab/main.cf.template,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- main.cf.template	23 May 2004 15:10:11 -0000	1.11
+++ main.cf.template	25 May 2004 00:19:19 -0000	1.12
@@ -111,6 +111,7 @@
 # LDAP Alias support
 #
 
+ldapvirtual_server_host = @@@ldap_uri@@@
 ldapvirtual_search_base = @@@user_dn_list@@@
 ldapvirtual_query_filter = (alias=%s)
 ldapvirtual_result_attribute = mail
@@ -124,6 +125,7 @@
 # LDAP Distributionlist support
 #
 
+ldapdistlist_server_host = @@@ldap_uri@@@
 ldapdistlist_search_base = @@@user_dn_list@@@
 ldapdistlist_query_filter = (cn=%u)
 ldapdistlist_special_result_attribute = member
@@ -138,6 +140,7 @@
 # LDAP Transport for multilocation support
 #
 
+ldaptransport_server_host = @@@ldap_uri@@@
 ldaptransport_search_base = @@@user_dn_list@@@
 ldaptransport_query_filter = (&(mail=%s)(objectClass=kInetOrgPerson)(!(homeServer=$myhostname)))
 ldaptransport_result_attribute = homeServer