steffen: server/kolab/kolab kolab.schema, 1.13, 1.14 kolab_bootstrap, 1.35, 1.36 kolab_smtpdpolicy, 1.6, 1.7

[cvs at intevation.de]

Author: steffen

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

Modified Files:
	kolab.schema kolab_bootstrap kolab_smtpdpolicy 
Log Message:
shared folder handling + multiple bugfixes

Index: kolab.schema
===================================================================
RCS file: /kolabrepository/server/kolab/kolab/kolab.schema,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- kolab.schema	14 Jun 2004 01:22:57 -0000	1.13
+++ kolab.schema	21 Jun 2004 01:46:39 -0000	1.14
@@ -739,7 +739,7 @@
 	DESC 'IMAP shared folder'
 	SUP top STRUCTURAL
 	MUST cn
-	MAY ( acl $ userquota $ deleteflag ) ) 
+	MAY ( acl $ userquota $ deleteflag $ homeServer ) ) 
 
 objectclass ( 1.3.6.1.4.1.5322.13.1.1 NAME 'namedObject' 
 	SUP top STRUCTURAL 

Index: kolab_bootstrap
===================================================================
RCS file: /kolabrepository/server/kolab/kolab/kolab_bootstrap,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- kolab_bootstrap	18 Jun 2004 01:25:58 -0000	1.35
+++ kolab_bootstrap	21 Jun 2004 01:46:39 -0000	1.36
@@ -228,6 +228,10 @@
 	."Please stop any running ldap server and bootstrap again\n";
       tryConnect( '127.0.0.1', 9999 ) && die "A process is already listening to port 9999 (kolabd)\n"
 	."Please stop any running kolabd and bootstrap again\n";
+      if( `ps aux|grep slurpd` ) {
+	print "WARNING: Detected running slurpd processes.\n";
+	print " Please make sure the OpenLDAP server is stopped properly!\n";
+      }
 
       # Creating slapd.conf from template
       my $tmpl = IO::File->new("$kolab_prefix/etc/kolab/templates/slapd.conf.template", "r") || die "could not read $kolab_prefix/etc/kolab/templates/slapd.conf.template";
@@ -430,6 +434,10 @@
     ."Please stop any running ldap server and bootstrap again\n";
   tryConnect( '127.0.0.1', 9999 ) && die "A process is already listening to port 9999 (kolabd)\n"
     ."Please stop any running kolabd and bootstrap again\n";
+  if( `ps aux|grep slurpd` ) {
+    print "WARNING: Detected running slurpd processes.\n";
+    print " Please make sure the OpenLDAP server is stopped properly!\n";
+  }
 
   # For now we just connect to the remote slapd
  SLAVESTART:
@@ -437,9 +445,18 @@
   print "URI of master LDAP server: ";
   $ldap_uri = ReadLine;
   chomp $ldap_uri;
-  print "Base DN of server: ";
-  $base_dn = ReadLine;
-  chomp $base_dn;
+  my $ldapuri = URI->new($ldap_uri) || warn "error: could not parse given uri";
+  if( $ldapuri ) { 
+    $base_dn = join( ',', map { "dc=$_" } split /\./, $ldapuri->host() );
+  }
+  print "Base DN of server [$base_dn]: ";
+  $tmp = ReadLine;
+  chomp $tmp;
+  if( $tmp ) {
+    $base_dn = $tmp;
+  }
+  print "proceeding with base DN $base_dn\n";
+
   $bind_dn = "cn=manager,$base_dn";
   print "Manager password: ";
   $bind_pw = ReadLine;
@@ -449,7 +466,6 @@
   copy("$kolab_prefix/etc/kolab/templates/smtpd.conf.template", $confname) || die "could not write to $confname";
 
   print "Checking server info...\n";
-  my $ldapuri = URI->new($ldap_uri) || warn "error: could not parse given uri";
   my $ldap = Net::LDAP->new($ldap_uri, verify => 'none' ) || warn "could not connect ldap server";
   if ($ldap) {
     $ldap->bind($bind_dn, password=> $bind_pw) || warn "could not bind to ldap";

Index: kolab_smtpdpolicy
===================================================================
RCS file: /kolabrepository/server/kolab/kolab/kolab_smtpdpolicy,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- kolab_smtpdpolicy	18 Jun 2004 01:25:58 -0000	1.6
+++ kolab_smtpdpolicy	21 Jun 2004 01:46:39 -0000	1.7
@@ -164,7 +164,7 @@
 	    contains( $username, @{$ldapobject->get_value('delegate', asref => 1 )})  ) {
 	  # All OK, user is sending as herself or as delegate
 	  mylog($syslog_priority, "$username using valid from address $sender") if $verbose;	
-	  return "DUNNO";
+	  goto CHECKDISTLIST;
 	}
       }
     } else {
@@ -176,9 +176,8 @@
     return "REJECT Invalid sender";
   }
 
+  # Check for valid access to restricted distribution lists
  CHECKDISTLIST:
-
-  # Now check for valid access to restricted distribution lists
   if( !$username ) {
     $recip =~ /(.*)@(.*)/;
     my $cn = $1;