steffen: server/kolab/kolab kolab.schema, 1.12, 1.13 kolab_bootstrap, 1.32, 1.33

[cvs at intevation.de]

Author: steffen

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

Modified Files:
	kolab.schema kolab_bootstrap 
Log Message:
more group stuff + multiple bugfixes

Index: kolab.schema
===================================================================
RCS file: /kolabrepository/server/kolab/kolab/kolab.schema,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- kolab.schema	11 Jun 2004 08:55:05 -0000	1.12
+++ kolab.schema	14 Jun 2004 01:22:57 -0000	1.13
@@ -937,7 +937,6 @@
 	MAY (
                 homeServer $
 		unrestrictedMailSize $
-		delegate $
-		userClass		
+		delegate		
 		)
 	)

Index: kolab_bootstrap
===================================================================
RCS file: /kolabrepository/server/kolab/kolab/kolab_bootstrap,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- kolab_bootstrap	11 Jun 2004 08:55:05 -0000	1.32
+++ kolab_bootstrap	14 Jun 2004 01:22:57 -0000	1.33
@@ -265,23 +265,23 @@
 
       # create kolab config object
       my $mynetworkinterfaces = "127.0.0.0/8";
-      my @net=`/sbin/ifconfig -a | grep -v 127.0.0 | grep -i \"inet\"`;
-      chomp @net;
-      foreach (@net) {
-	/127\.0\.0/ && next;
-         s/^ *(.*)/$1/g;
-         my @tmp = split / /;
-         my $ip;
-         my $mask;
-         foreach (@tmp) {
-            if (/addr.*:(.*)$/i) { $ip = $1; }
-            if (/mask.*:(.*)$/i) { $mask = $1 }
-         }
-         if ($ip && $mask) {
-            my $tmp = new Net::Netmask ($ip."/".$mask);
-            $mynetworkinterfaces .= ", ".$tmp->base()."/".$tmp->bits();
-         }
-      }
+#       my @net=`/sbin/ifconfig -a | grep -v 127.0.0 | grep -i \"inet\"`;
+#       chomp @net;
+#       foreach (@net) {
+# 	/127\.0\.0/ && next;
+#          s/^ *(.*)/$1/g;
+#          my @tmp = split / /;
+#          my $ip;
+#          my $mask;
+#          foreach (@tmp) {
+#             if (/addr.*:(.*)$/i) { $ip = $1; }
+#             if (/mask.*:(.*)$/i) { $mask = $1 }
+#          }
+#          if ($ip && $mask) {
+#             my $tmp = new Net::Netmask ($ip."/".$mask);
+#             $mynetworkinterfaces .= ", ".$tmp->base()."/".$tmp->bits();
+#          }
+#       }
       print "mynetworkinterfaces: ".$mynetworkinterfaces."\n";
 
       $ldapobject->replace(
@@ -328,6 +328,22 @@
       $ldapobject = newOrExistingLDAPEntry( $ldap, "cn=external,$base_dn" );
       $ldapobject->replace('cn' => 'external', 'objectclass' => ['top','namedObject']);
       $ldapobject->dn("cn=external,$base_dn");
+      $mesg = $ldapobject->update($ldap);
+      $mesg && $mesg->code && warn "failed to write entry: ", $mesg->error;
+      undef $ldapobject;
+
+      # create groups user topnode
+      $ldapobject = newOrExistingLDAPEntry( $ldap, "cn=groups,$base_dn" );
+      $ldapobject->replace('cn' => 'groups', 'objectclass' => ['top','namedObject']);
+      $ldapobject->dn("cn=groups,$base_dn");
+      $mesg = $ldapobject->update($ldap);
+      $mesg && $mesg->code && warn "failed to write entry: ", $mesg->error;
+      undef $ldapobject;
+
+      # create resources user topnode
+      $ldapobject = newOrExistingLDAPEntry( $ldap, "cn=resources,$base_dn" );
+      $ldapobject->replace('cn' => 'resources', 'objectclass' => ['top','namedObject']);
+      $ldapobject->dn("cn=resources,$base_dn");
       $mesg = $ldapobject->update($ldap);
       $mesg && $mesg->code && warn "failed to write entry: ", $mesg->error;
       undef $ldapobject;