gunnar: server/kolabd/kolabd ChangeLog, 1.121, 1.122 kolab.globals.in, 1.9, 1.10 kolab_bootstrap.in, 1.28, 1.29

[cvs at kolab.org]

Author: gunnar

Update of /kolabrepository/server/kolabd/kolabd
In directory doto:/tmp/cvs-serv23550/kolabd/kolabd

Modified Files:
	ChangeLog kolab.globals.in kolab_bootstrap.in 
Log Message:
kolab/issue1313 (resmngr cannot create calendar folder in multidomain setup)

Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/ChangeLog,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -d -r1.121 -r1.122
--- ChangeLog	27 Nov 2007 07:30:24 -0000	1.121
+++ ChangeLog	28 Nov 2007 12:45:32 -0000	1.122
@@ -1,3 +1,17 @@
+2007-11-28  Gunnar Wrobel  <p at rdus.de>
+
+	* templates/kolab.conf.template.in (calendar_id):
+
+	Rename "calendar_dn" to "calendar_id"
+
+	* kolab_bootstrap.in:
+
+	Use "calendar_id" instead of "calendar_pw"
+
+	* kolab.globals.in (calendar_id):
+
+	Added global calendar_id setting.
+
 2007-11-27  Gunnar Wrobel  <p at rdus.de>
 
 	* dist_conf/common:

Index: kolab.globals.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/kolab.globals.in,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- kolab.globals.in	17 Oct 2007 17:57:13 -0000	1.9
+++ kolab.globals.in	28 Nov 2007 12:45:32 -0000	1.10
@@ -46,3 +46,4 @@
 local_addr : 127.0.0.1
 bind_any : TRUE
 bind_addr : 0.0.0.0
+calendar_id : calendar

Index: kolab_bootstrap.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/kolab_bootstrap.in,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- kolab_bootstrap.in	17 Oct 2007 17:57:13 -0000	1.28
+++ kolab_bootstrap.in	28 Nov 2007 12:45:32 -0000	1.29
@@ -270,7 +270,7 @@
 my $base_dn = $kolab_config{'base_dn'} || die "could not read base_dn from $kolab_config";
 my $php_dn = $kolab_config{'php_dn'} || die "could not read php_dn from $kolab_config";
 my $php_pw = $kolab_config{'php_pw'} || die "could not read php_pw from $kolab_config";
-my $calendar_dn = $kolab_config{'calendar_dn'};
+my $calendar_id = $kolab_config{'calendar_id'};
 my $calendar_pw = $kolab_config{'calendar_pw'};
 my $slurpd_addr = $kolab_config{'slurpd_addr'} || die "could not read slurpd_addr from $kolab_config";
 my $slurpd_port = $kolab_config{'slurpd_port'} || die "could not read slurpd_port from $kolab_config";
@@ -353,10 +353,7 @@
       $php_pw = `@bindir@/openssl rand -base64 30`;
       chomp $php_pw;
     }
-    if ($calendar_dn =~ /\@\@\@/) {
-      $calendar_dn =~ s/\@\@\@kolab_basedn\@\@\@/$base_dn/g;
-      chomp $calendar_dn;
-    }
+
     if ($calendar_pw =~ /\@\@\@/) {
       $calendar_pw = `@bindir@/openssl rand -base64 30`;
       chomp $calendar_pw;
@@ -373,7 +370,7 @@
     print $fd "ldap_master_uri : $ldap_uri\n";
     print $fd "php_dn : $php_dn\n";
     print $fd "php_pw : $php_pw\n";
-    print $fd "calendar_dn : $calendar_dn\n";
+    print $fd "calendar_id : $calendar_id\n";
     print $fd "calendar_pw : $calendar_pw\n";
     print $fd "slurpd_addr : $slurpd_addr\n";
     print $fd "slurpd_port : $slurpd_port\n";
@@ -609,11 +606,11 @@
       undef $ldapobject;
 
       # create calendar user
-      $ldapobject = newOrExistingLDAPEntry( $ldap, "cn=calendar,cn=internal,$base_dn" );
-      $ldapobject->replace('cn' => 'calendar', 'sn' => 'n/a n/a', 'uid' => 'calendar@'.$domain,
+      $ldapobject = newOrExistingLDAPEntry( $ldap, "cn=$calendar_id@$domain,cn=internal,$base_dn" );
+      $ldapobject->replace('cn' => $calendar_id . '@' . $domain, 'sn' => 'n/a n/a', 'uid' => $calendar_id . '@' . $domain,
                            'userPassword' => hashPassword($calendar_pw), 
 			   'objectclass' => ['top','inetorgperson','kolabinetorgperson']);
-      $ldapobject->dn("cn=calendar,cn=internal,$base_dn");
+      $ldapobject->dn("cn=$calendar_id@$domain,cn=internal,$base_dn");
       $mesg = $ldapobject->update($ldap);
       $mesg && $mesg->code && warn "failed to write entry: ", $mesg->error;
       undef $ldapobject;
@@ -779,7 +776,7 @@
   #my $entry = $mesg->entry(0);
   #$php_pw = $entry->get_value( 'userPassword' );
 
-  $calendar_dn = "cn=calendar,cn=internal,$base_dn";
+  $calendar_dn = "cn=$calendar_id@$domain,cn=internal,$base_dn";
   $mesg = $ldap->search(base=> $php_dn, scope=> 'exact', filter=> "(objectclass=*)");
   if ($mesg && $mesg->count != 1) {
     print "Calendar object not found, please check your input\n";
@@ -830,7 +827,7 @@
   print $fd "ldap_master_uri : $ldap_uri\n";
   print $fd "php_dn : $php_dn\n";
   print $fd "php_pw : $php_pw\n";
-  print $fd "calendar_dn : $calendar_dn\n";
+  print $fd "calendar_id : $calendar_id\n";
   print $fd "calendar_pw : $calendar_pw\n";
   print $fd "slurpd_addr : $slurpd_addr\n";
   print $fd "slurpd_port : $slurpd_port\n";
@@ -935,7 +932,7 @@
   print $fd "ldap_master_uri : $ldap_uri\n";
   print $fd "php_dn : $php_dn\n";
   print $fd "php_pw : $php_pw\n";
-  print $fd "calendar_dn : $calendar_dn\n";
+  print $fd "calendar_id : $calendar_id\n";
   print $fd "calendar_pw : $calendar_pw\n";
   print $fd "slurpd_addr : $slurpd_addr\n";
   print $fd "slurpd_port : $slurpd_port\n";