steffen: server/kolab/kolab kolab.conf, 1.5, 1.6 kolab.globals, 1.1, 1.2 kolab2.schema, 1.9, 1.10 kolab_bootstrap, 1.54, 1.55 kolab_smtpdpolicy, 1.12, 1.13
cvs at intevation.de
cvs at intevation.de
Thu Aug 12 12:55:41 CEST 2004
Author: steffen
Update of /kolabrepository/server/kolab/kolab
In directory doto:/tmp/cvs-serv3739/kolab/kolab
Modified Files:
kolab.conf kolab.globals kolab2.schema kolab_bootstrap
kolab_smtpdpolicy
Log Message:
*BOMB*. Changes to support the new schema
Index: kolab.conf
===================================================================
RCS file: /kolabrepository/server/kolab/kolab/kolab.conf,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- kolab.conf 14 Jul 2004 21:17:41 -0000 1.5
+++ kolab.conf 12 Aug 2004 10:55:39 -0000 1.6
@@ -1,7 +1,7 @@
# This program is Free Software under the GNU General Public License (>=v2).
# Read the file COPYING that comes with this packages for details.
-fqhostname : @@@fqhostname@@@
+fqdnhostname : @@@fqdnhostname@@@
is_master : @@@is_master@@@
base_dn : @@@kolab_basedn@@@
bind_dn : cn=manager,@@@kolab_basedn@@@
Index: kolab.globals
===================================================================
RCS file: /kolabrepository/server/kolab/kolab/kolab.globals,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- kolab.globals 31 Mar 2004 13:23:12 -0000 1.1
+++ kolab.globals 12 Aug 2004 10:55:39 -0000 1.2
@@ -13,15 +13,15 @@
postfix-mydestination : $mydomain
proftpd-ftp : FALSE
proftpd-userPassword :
-sf_field_deleted : deleteflag
+sf_field_deleted : kolabdeleteflag
sf_field_guid : entryUUID
sf_field_modified : modifytimestamp
sf_field_quota : userquota
-sf_object_class : sharedfolder
+sf_object_class : kolabsharedfolder
slurpd_port : 9999
uid : freebusy
userPassword : freebusy
-user_field_deleted : deleteflag
+user_field_deleted : kolabdeleteflag
user_field_guid : entryUUID
user_field_modified : modifytimestamp
user_field_quota : userquota
Index: kolab2.schema
===================================================================
RCS file: /kolabrepository/server/kolab/kolab/kolab2.schema,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- kolab2.schema 12 Aug 2004 02:04:21 -0000 1.9
+++ kolab2.schema 12 Aug 2004 10:55:39 -0000 1.10
@@ -142,6 +142,10 @@
NAME 'postfix-enable-virus-scan'
SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 )
+attributetype ( 1.3.6.1.4.1.19414.2.1.508
+ NAME 'postfix-allow-unauthenticated'
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 )
+
##########################
# cyrus imapd attributes #
##########################
@@ -246,6 +250,7 @@
postfix-relayhost $
postfix-transport $
postfix-enable-virus-scan $
+ postfix-allow-unauthenticated $
cyrus-autocreatequota $
cyrus-quotawarn $
cyrus-autocreatequota $
Index: kolab_bootstrap
===================================================================
RCS file: /kolabrepository/server/kolab/kolab/kolab_bootstrap,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -d -r1.54 -r1.55
--- kolab_bootstrap 11 Aug 2004 12:53:59 -0000 1.54
+++ kolab_bootstrap 12 Aug 2004 10:55:39 -0000 1.55
@@ -107,17 +107,17 @@
}
}
-sub newGroupOfNames {
+sub newkolabgroupofnames {
my $ldap = shift;
my $basedn = shift;
my $cn = shift;
if( scalar(@_) < 1 ) {
- warn "groupOfNames must contain at least one member";
+ warn "kolabgroupofnames must contain at least one member";
}
my $ldapobject = newOrExistingLDAPEntry($ldap,"cn=$cn,$basedn");
- $ldapobject->replace('cn' => $cn, 'objectclass' => ['top','groupOfNames'],
+ $ldapobject->replace('cn' => $cn, 'objectclass' => ['top','kolabgroupofnames'],
'member' => @_);
$ldapobject->dn("cn=$cn,$basedn");
my $mesg = $ldapobject->update($ldap);
@@ -188,7 +188,7 @@
}
}
undef $fd;
-my $fqhostname = $kolab_config{'fqhostname'} || die "could not read fqhostname from $kolab_config";
+my $fqdnhostname = $kolab_config{'fqdnhostname'} || die "could not read fqdnhostname from $kolab_config";
my $is_master = $kolab_config{'is_master'} || "true";
my $bind_dn = $kolab_config{'bind_dn'} || die "could not read bind_dn from $kolab_config";
my $bind_pw = $kolab_config{'bind_pw'} || die "could not read bind_pw from $kolab_config";
@@ -203,10 +203,10 @@
die "and run kolab_bootstrap afterwards, manually";
}
my $fqdn;
-if( $fqhostname =~ /\@\@\@/ ) {
+if( $fqdnhostname =~ /\@\@\@/ ) {
$fqdn = `hostname -f`;
} else {
- $fqdn = $fqhostname;
+ $fqdn = $fqdnhostname;
}
chomp($fqdn);
@@ -272,7 +272,7 @@
$fd = IO::File->new($kolab_config, "w+") || die "could not open $kolab_config";
- print $fd "fqhostname : $fqdn\n";
+ print $fd "fqdnhostname : $fqdn\n";
print $fd "is_master : $is_master\n";
print $fd "base_dn : $base_dn\n";
print $fd "bind_dn : $bind_dn\n";
@@ -394,8 +394,8 @@
'uid' => "freebusy",
'userPassword' => "freebusy",
'objectclass' => ['top', 'kolab' ] );
- # Get rid of fqhostname, it will cause pain and suffering...
- #$ldapobject->delete( 'fqhostname' );
+ # Get rid of fqdnhostname, it will cause pain and suffering...
+ #$ldapobject->delete( 'fqdnhostname' );
$ldapobject->dn("k=kolab,$base_dn");
$mesg = $ldapobject->update($ldap);
$mesg && $mesg->code && warn "failed to write entry: ", $mesg->error;
@@ -403,7 +403,7 @@
# create internal user topnode
$ldapobject = newOrExistingLDAPEntry( $ldap, "cn=internal,$base_dn" );
- $ldapobject->replace('cn' => 'internal', 'objectclass' => ['top','namedObject']);
+ $ldapobject->replace('cn' => 'internal', 'objectclass' => ['top','kolabnamedobject']);
$ldapobject->dn("cn=internal,$base_dn");
$mesg = $ldapobject->update($ldap);
$mesg && $mesg->code && warn "failed to write entry: ", $mesg->error;
@@ -411,7 +411,7 @@
# create external user topnode
$ldapobject = newOrExistingLDAPEntry( $ldap, "cn=external,$base_dn" );
- $ldapobject->replace('cn' => 'external', 'objectclass' => ['top','namedObject']);
+ $ldapobject->replace('cn' => 'external', 'objectclass' => ['top','kolabnamedobject']);
$ldapobject->dn("cn=external,$base_dn");
$mesg = $ldapobject->update($ldap);
$mesg && $mesg->code && warn "failed to write entry: ", $mesg->error;
@@ -419,7 +419,7 @@
# create groups user topnode
$ldapobject = newOrExistingLDAPEntry( $ldap, "cn=groups,$base_dn" );
- $ldapobject->replace('cn' => 'groups', 'objectclass' => ['top','namedObject']);
+ $ldapobject->replace('cn' => 'groups', 'objectclass' => ['top','kolabnamedobject']);
$ldapobject->dn("cn=groups,$base_dn");
$mesg = $ldapobject->update($ldap);
$mesg && $mesg->code && warn "failed to write entry: ", $mesg->error;
@@ -427,19 +427,19 @@
# create resources user topnode
$ldapobject = newOrExistingLDAPEntry( $ldap, "cn=resources,$base_dn" );
- $ldapobject->replace('cn' => 'resources', 'objectclass' => ['top','namedObject']);
+ $ldapobject->replace('cn' => 'resources', 'objectclass' => ['top','kolabnamedobject']);
$ldapobject->dn("cn=resources,$base_dn");
$mesg = $ldapobject->update($ldap);
$mesg && $mesg->code && warn "failed to write entry: ", $mesg->error;
undef $ldapobject;
# create admin group
- newGroupOfNames( $ldap, $base_dn, 'admin', "cn=manager,$base_dn" );
+ newkolabgroupofnames( $ldap, $base_dn, 'admin', "cn=manager,$base_dn" );
# create manager user
$ldapobject = newOrExistingLDAPEntry( $ldap, $bind_dn );
$ldapobject->replace('cn' => 'manager', 'sn' => 'n/a', 'uid' => 'manager',
- 'userPassword' => $bind_pw, 'objectclass' => ['top','kInetOrgPerson']);
+ 'userPassword' => $bind_pw, 'objectclass' => ['top','inetorgperson','kolabinetorgperson']);
$ldapobject->dn($bind_dn);
$mesg = $ldapobject->update($ldap);
$mesg && $mesg->code && warn "failed to write entry: ", $mesg->error;
@@ -448,14 +448,14 @@
# create php read-only user
$ldapobject = newOrExistingLDAPEntry( $ldap, "cn=nobody,$base_dn" );
$ldapobject->replace('cn' => 'nobody', 'sn' => 'n/a n/a', 'uid' => 'nobody',
- 'userPassword' => $php_pw, 'objectclass' => ['top','kInetOrgPerson']);
+ 'userPassword' => $php_pw, 'objectclass' => ['top','inetorgperson','kolabinetorgperson']);
$ldapobject->dn("cn=nobody,$base_dn");
$mesg = $ldapobject->update($ldap);
$mesg && $mesg->code && warn "failed to write entry: ", $mesg->error;
undef $ldapobject;
# create mainainter group
- newGroupOfNames( $ldap, $base_dn, 'maintainer', "cn=manager,$base_dn" );
+ newkolabgroupofnames( $ldap, $base_dn, 'maintainer', "cn=manager,$base_dn" );
$ldap->unbind;
}
@@ -623,7 +623,7 @@
$fd = IO::File->new($kolab_config, "w+") || die "could not open $kolab_config";
- print $fd "fqhostname : $fqdn\n";
+ print $fd "fqdnhostname : $fqdn\n";
print $fd "is_master : $is_master\n";
print $fd "base_dn : $base_dn\n";
print $fd "bind_dn : $bind_dn\n";
@@ -718,7 +718,7 @@
kolab_system("$kolab_prefix/sbin/kolabconf -n");
$fd = IO::File->new($kolab_config, "w+") || die "could not open $kolab_config";
- print $fd "fqhostname : $fqdn\n";
+ print $fd "fqdnhostname : $fqdn\n";
print $fd "is_master : $is_master\n";
print $fd "base_dn : $base_dn\n";
print $fd "bind_dn : $bind_dn\n";
Index: kolab_smtpdpolicy
===================================================================
RCS file: /kolabrepository/server/kolab/kolab/kolab_smtpdpolicy,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- kolab_smtpdpolicy 11 Aug 2004 23:49:52 -0000 1.12
+++ kolab_smtpdpolicy 12 Aug 2004 10:55:39 -0000 1.13
@@ -30,7 +30,7 @@
#
# Usage: kolab_smtpd_policy.pl [-v]
#
-# Delegated Postfix SMTPD policy server for Kolab. This server implements
+# kolabdelegated Postfix SMTPD policy server for Kolab. This server implements
# various policies for Kolab:
#
# 1) Only authenticated users can use From addresses <username>@$domain
@@ -154,15 +154,15 @@
my $mesg = $ldap->search( base=> $conf_basedn,
scope=> 'sub',
- filter=> "(&(objectClass=kInetOrgPerson)(|(mail=$sender)(alias=$sender)))");
+ filter=> "(&(objectClass=kolabinetorgperson)(|(mail=$sender)(alias=$sender)))");
if( !$mesg->code ) {
mylog($syslog_priority, "LDAP search returned ".$mesg->count()." objects") if $verbose;
foreach $ldapobject ($mesg->entries) {
mylog($syslog_priority, "Got object ".$ldapobject->get_value('uid') ) if $verbose;
if( $username && ( lc($username) eq lc($ldapobject->get_value('uid')) ||
lc($username) eq lc($ldapobject->get_value('mail')) ||
- contains( $username, @{$ldapobject->get_value('delegate', asref => 1 )})) ) {
- # All OK, user is sending as herself or as delegate
+ contains( $username, @{$ldapobject->get_value('kolabdelegate', asref => 1 )})) ) {
+ # All OK, user is sending as herself or as kolabdelegate
mylog($syslog_priority, "$username using valid from address $sender") if $verbose;
goto CHECKDISTLIST;
}
@@ -194,7 +194,7 @@
my $domain = $2;
if( contains($domain, at conf_domain ) ) {
$mesg = $ldap->search( base=> "cn=$cn,cn=internal,".$conf_basedn,
- scope=> 'exact', filter=> "(objectClass=groupOfNames)");
+ scope=> 'exact', filter=> "(objectClass=kolabgroupofnames)");
if( !$mesg->code && $mesg->count() > 0 ) {
# Ups, recipient is a restricted list, reject
mylog( $syslog_priority, "Attempt from $sender to access restricted list $recip" ) if $verbose;
More information about the commits
mailing list