gunnar: server/kolabd/kolabd kolab_bootstrap.in,1.31,1.32

cvs at kolab.org cvs at kolab.org
Fri Nov 30 15:02:25 CET 2007


Author: gunnar

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

Modified Files:
	kolab_bootstrap.in 
Log Message:
Fix another bootstrap issue.

Index: kolab_bootstrap.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/kolab_bootstrap.in,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- kolab_bootstrap.in	30 Nov 2007 13:53:30 -0000	1.31
+++ kolab_bootstrap.in	30 Nov 2007 14:02:23 -0000	1.32
@@ -611,7 +611,7 @@
       $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_id@$domain,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;
@@ -777,7 +777,7 @@
   #my $entry = $mesg->entry(0);
   #$php_pw = $entry->get_value( 'userPassword' );
 
-  my $calendar_dn = "cn=$calendar_id@$domain,cn=internal,$base_dn";
+  my $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";





More information about the commits mailing list