steffen: server/kolab/kolab kolab_bootstrap,1.55,1.56

[cvs at intevation.de]

Author: steffen

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

Modified Files:
	kolab_bootstrap 
Log Message:
Move system user to internal subtree. Fix for Issue324

Index: kolab_bootstrap
===================================================================
RCS file: /kolabrepository/server/kolab/kolab/kolab_bootstrap,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -d -r1.55 -r1.56
--- kolab_bootstrap	12 Aug 2004 10:55:39 -0000	1.55
+++ kolab_bootstrap	20 Aug 2004 02:10:00 -0000	1.56
@@ -434,7 +434,7 @@
       undef $ldapobject;
 
       # create admin group
-      newkolabgroupofnames( $ldap, $base_dn, 'admin', "cn=manager,$base_dn" );
+      newkolabgroupofnames( $ldap, "cn=internal,$base_dn", 'admin', $bind_dn );
 
       # create manager user
       $ldapobject = newOrExistingLDAPEntry( $ldap, $bind_dn );
@@ -446,16 +446,16 @@
       undef $ldapobject;
 
       # create php read-only user
-      $ldapobject = newOrExistingLDAPEntry( $ldap, "cn=nobody,$base_dn" );
+      $ldapobject = newOrExistingLDAPEntry( $ldap, "cn=nobody,cn=internal,$base_dn" );
       $ldapobject->replace('cn' => 'nobody', 'sn' => 'n/a n/a', 'uid' => 'nobody',
                            'userPassword' => $php_pw, 'objectclass' => ['top','inetorgperson','kolabinetorgperson']);
-      $ldapobject->dn("cn=nobody,$base_dn");
+      $ldapobject->dn("cn=nobody,cn=internal,$base_dn");
       $mesg = $ldapobject->update($ldap);
       $mesg && $mesg->code && warn "failed to write entry: ", $mesg->error;
       undef $ldapobject;
 
       # create mainainter group
-      newkolabgroupofnames( $ldap, $base_dn, 'maintainer', "cn=manager,$base_dn" );
+      newkolabgroupofnames( $ldap, "cn=internal,$base_dn", 'maintainer', $bind_dn );
 
       $ldap->unbind;
    }
@@ -578,7 +578,7 @@
   $base_dn = getUserInput("Base DN of server", $base_dn);
   print "proceeding with base DN $base_dn\n";
 
-  $bind_dn = "cn=manager,$base_dn";
+  $bind_dn = "cn=manager,cn=internal,$base_dn";
   $bind_pw = getUserInput("Manager password");
 
   my $confname = "$kolab_prefix/etc/sasl/apps/smtpd.conf";
@@ -593,7 +593,7 @@
       print "No $base_dn object found, please check your input\n";
       goto SLAVESTART;
     }
-    $php_dn = "cn=nobody,$base_dn";
+    $php_dn = "cn=nobody,cn=internal,$base_dn";
     $mesg = $ldap->search(base=> $php_dn, scope=> 'exact', filter=> "(objectclass=*)");
     if ($mesg && $mesg->count != 1) {
       print "Nobody object not found, please check your input\n";