stuart: devel/kolab/Kolab Cyrus.pm, 1.1.1.1, 1.2 DirServ.pm, 1.1.1.1, 1.2 LDAP.pm, 1.1.1.1, 1.2 Mailer.pm, 1.1.1.1, 1.2
cvs at intevation.de
cvs at intevation.de
Wed May 12 15:12:37 CEST 2004
Author: stuart
Update of /kolabrepository/devel/kolab/Kolab
In directory doto:/tmp/cvs-serv24022/Kolab
Modified Files:
Cyrus.pm DirServ.pm LDAP.pm Mailer.pm
Log Message:
Added pointer to COPYING for licensing details
Changed $config{'prefix'} to $config{'kolab_root'}
Updated daemon for the new template stuff
Index: Cyrus.pm
===================================================================
RCS file: /kolabrepository/devel/kolab/Kolab/Cyrus.pm,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- Cyrus.pm 3 May 2004 14:04:04 -0000 1.1.1.1
+++ Cyrus.pm 12 May 2004 13:12:34 -0000 1.2
@@ -1,23 +1,27 @@
package Kolab::Cyrus;
-##
-## Copyright (c) 2003 Code Fusion cc
-##
-## Writen by Stuart Bingë <s.binge at codefusion.co.za>
-##
-## This program is free software; you can redistribute it and/or
-## modify it under the terms of the GNU General Public License as
-## published by the Free Software Foundation; either version 2, or
-## (at your option) any later version.
-##
-## This program is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-## General Public License for more details.
-##
-## You can view the GNU General Public License, online, at the GNU
-## Project's homepage; see <http://www.gnu.org/licenses/gpl.html>.
-##
+##########################################################################
+## ##
+## The Kolab Groupware Server ##
+## ##
+## See the file CONTRIBUTORS that was distributed with this program ##
+## for copyright information. ##
+## ##
+## This program is free software; you can redistribute it and / or ##
+## modify it under the terms of the GNU General Public License as ##
+## published by the Free Software Foundation; either version 2 of the ##
+## License, or (at your option) any later version. ##
+## ##
+## This program is distributed in the hope that it will be useful, ##
+## but WITHOUT ANY WARRANTY; without even the implied warranty of ##
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ##
+## General Public License for more details. ##
+## ##
+## You can view the GNU General Public License, online, at the GNU ##
+## project's web site; see <http://www.gnu.org/licenses/gpl.html>. ##
+## The full text of the license is also included in the file COPYING. ##
+## ##
+##########################################################################
use 5.008;
use strict;
@@ -139,7 +143,7 @@
my $cyruid = &createUid($uid, $sf);
Kolab::log('Y', "Setting up ACL of mailbox `$cyruid'");
- my $prefix = $Kolab::config{'prefix'};
+ my $prefix = $Kolab::config{'kolab_root'};
my @acls = `$prefix/etc/kolab/workaround.sh $cyruid $Kolab::config{'bind_pw'} | sed -e /localhost/d`;
my ($user, $entry, $acl);
Kolab::log('Y', "Removing users from ACL of $cyruid", KOLAB_DEBUG);
Index: DirServ.pm
===================================================================
RCS file: /kolabrepository/devel/kolab/Kolab/DirServ.pm,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- DirServ.pm 3 May 2004 14:04:04 -0000 1.1.1.1
+++ DirServ.pm 12 May 2004 13:12:34 -0000 1.2
@@ -1,22 +1,27 @@
package Kolab::DirServ;
-##
-## Copyright (c) 2003 Code Fusion cc
-## Writen by Stephan Buys <s.buys at codefusion.co.za>
-##
-## This program is free software; you can redistribute it and/or
-## modify it under the terms of the GNU General Public License as
-## published by the Free Software Foundation; either version 2, or
-## (at your option) any later version.
-##
-## This program is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-## General Public License for more details.
-##
-## You can view the GNU General Public License, online, at the GNU
-## Project's homepage; see <http://www.gnu.org/licenses/gpl.html>.
-##
+##########################################################################
+## ##
+## The Kolab Groupware Server ##
+## ##
+## See the file CONTRIBUTORS that was distributed with this program ##
+## for copyright information. ##
+## ##
+## This program is free software; you can redistribute it and / or ##
+## modify it under the terms of the GNU General Public License as ##
+## published by the Free Software Foundation; either version 2 of the ##
+## License, or (at your option) any later version. ##
+## ##
+## This program is distributed in the hope that it will be useful, ##
+## but WITHOUT ANY WARRANTY; without even the implied warranty of ##
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ##
+## General Public License for more details. ##
+## ##
+## You can view the GNU General Public License, online, at the GNU ##
+## project's web site; see <http://www.gnu.org/licenses/gpl.html>. ##
+## The full text of the license is also included in the file COPYING. ##
+## ##
+##########################################################################
use 5.008;
use strict;
@@ -62,7 +67,7 @@
sub reloadPeers
{
- @peers = readList($Kolab::config{'prefix'} . "/etc/kolab/addressbook.peers");
+ @peers = readList($Kolab::config{'kolab_root'} . "/etc/kolab/addressbook.peers");
foreach my $peer (@peers) {
Kolab::log('DS', "Using peer $peer", KOLAB_DEBUG);
Index: LDAP.pm
===================================================================
RCS file: /kolabrepository/devel/kolab/Kolab/LDAP.pm,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- LDAP.pm 3 May 2004 14:04:04 -0000 1.1.1.1
+++ LDAP.pm 12 May 2004 13:12:34 -0000 1.2
@@ -1,23 +1,27 @@
package Kolab::LDAP;
-##
-## Copyright (c) 2003 Code Fusion cc
-##
-## Writen by Stuart Bingë <s.binge at codefusion.co.za>
-##
-## This program is free software; you can redistribute it and/or
-## modify it under the terms of the GNU General Public License as
-## published by the Free Software Foundation; either version 2, or
-## (at your option) any later version.
-##
-## This program is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-## General Public License for more details.
-##
-## You can view the GNU General Public License, online, at the GNU
-## Project's homepage; see <http://www.gnu.org/licenses/gpl.html>.
-##
+##########################################################################
+## ##
+## The Kolab Groupware Server ##
+## ##
+## See the file CONTRIBUTORS that was distributed with this program ##
+## for copyright information. ##
+## ##
+## This program is free software; you can redistribute it and / or ##
+## modify it under the terms of the GNU General Public License as ##
+## published by the Free Software Foundation; either version 2 of the ##
+## License, or (at your option) any later version. ##
+## ##
+## This program is distributed in the hope that it will be useful, ##
+## but WITHOUT ANY WARRANTY; without even the implied warranty of ##
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ##
+## General Public License for more details. ##
+## ##
+## You can view the GNU General Public License, online, at the GNU ##
+## project's web site; see <http://www.gnu.org/licenses/gpl.html>. ##
+## The full text of the license is also included in the file COPYING. ##
+## ##
+##########################################################################
use 5.008;
use strict;
@@ -63,19 +67,19 @@
Kolab::log('L', 'Opening mailbox uid cache DB');
- if (!dbmopen(%uid_db, $Kolab::config{'prefix'} . '/var/kolab/mailbox-uidcache.db', 0666)) {
+ if (!dbmopen(%uid_db, $Kolab::config{'kolab_root'} . '/var/kolab/mailbox-uidcache.db', 0666)) {
Kolab::log('L', 'Unable to open mailbox uid cache DB', KOLAB_ERROR);
exit(1);
}
Kolab::log('L', 'Opening graveyard uid/timestamp cache DB');
- if (!dbmopen(%gyard_db, $Kolab::config{'prefix'} . '/var/kolab/graveyard-uidcache.db', 0666)) {
+ if (!dbmopen(%gyard_db, $Kolab::config{'kolab_root'} . '/var/kolab/graveyard-uidcache.db', 0666)) {
Kolab::log('L', 'Unable to open graveyard uid cache DB', KOLAB_ERROR);
exit(1);
}
- if (!dbmopen(%gyard_ts_db, $Kolab::config{'prefix'} . '/var/kolab/graveyard-tscache.db', 0666)) {
+ if (!dbmopen(%gyard_ts_db, $Kolab::config{'kolab_root'} . '/var/kolab/graveyard-tscache.db', 0666)) {
Kolab::log('L', 'Unable to open graveyard timestamp cache DB', KOLAB_ERROR);
exit(1);
}
Index: Mailer.pm
===================================================================
RCS file: /kolabrepository/devel/kolab/Kolab/Mailer.pm,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- Mailer.pm 3 May 2004 14:04:04 -0000 1.1.1.1
+++ Mailer.pm 12 May 2004 13:12:34 -0000 1.2
@@ -1,23 +1,27 @@
package Kolab::Mailer;
-##
-## Copyright (c) 2003 Code Fusion cc
-##
-## Writen by Stuart Bingë <s.binge at codefusion.co.za>
-##
-## This program is free software; you can redistribute it and/or
-## modify it under the terms of the GNU General Public License as
-## published by the Free Software Foundation; either version 2, or
-## (at your option) any later version.
-##
-## This program is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-## General Public License for more details.
-##
-## You can view the GNU General Public License, online, at the GNU
-## Project's homepage; see <http://www.gnu.org/licenses/gpl.html>.
-##
+##########################################################################
+## ##
+## The Kolab Groupware Server ##
+## ##
+## See the file CONTRIBUTORS that was distributed with this program ##
+## for copyright information. ##
+## ##
+## This program is free software; you can redistribute it and / or ##
+## modify it under the terms of the GNU General Public License as ##
+## published by the Free Software Foundation; either version 2 of the ##
+## License, or (at your option) any later version. ##
+## ##
+## This program is distributed in the hope that it will be useful, ##
+## but WITHOUT ANY WARRANTY; without even the implied warranty of ##
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ##
+## General Public License for more details. ##
+## ##
+## You can view the GNU General Public License, online, at the GNU ##
+## project's web site; see <http://www.gnu.org/licenses/gpl.html>. ##
+## The full text of the license is also included in the file COPYING. ##
+## ##
+##########################################################################
use 5.008;
use strict;
@@ -67,7 +71,7 @@
$mesg->attach(Data => $data);
}
- open(SENDMAIL, '|' . $Kolab::config{'prefix'} . '/sbin/sendmail -oi -t -odq');
+ open(SENDMAIL, '|' . $Kolab::config{'kolab_root'} . '/sbin/sendmail -oi -t -odq');
$mesg->print(\*SENDMAIL);
close(SENDMAIL);
}
@@ -86,7 +90,7 @@
Data => $text,
);
- open(SENDMAIL, '|' . $Kolab::config{'prefix'} . '/sbin/sendmail -oi -t -odq');
+ open(SENDMAIL, '|' . $Kolab::config{'kolab_root'} . '/sbin/sendmail -oi -t -odq');
$mesg->print(\*SENDMAIL);
close(SENDMAIL);
}
More information about the commits
mailing list