steffen: server/kolabd/kolabd kolab_smtpdpolicy.in,1.8,1.9
cvs at kolab.org
cvs at kolab.org
Fri Jul 28 06:44:35 CEST 2006
Author: steffen
Update of /kolabrepository/server/kolabd/kolabd
In directory doto:/tmp/cvs-serv8895
Modified Files:
kolab_smtpdpolicy.in
Log Message:
revive delegate functionality (Issue1273)
Index: kolab_smtpdpolicy.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/kolab_smtpdpolicy.in,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- kolab_smtpdpolicy.in 21 Jun 2006 10:49:19 -0000 1.8
+++ kolab_smtpdpolicy.in 28 Jul 2006 04:44:33 -0000 1.9
@@ -205,12 +205,18 @@
my $mesg = $ldap->search( base=> $conf_basedn,
scope=> 'sub',
filter=> "(&(objectClass=kolabinetorgperson)(|(mail=$sender)(alias=$sender)))",
- attrs => [ 'uid' ]);
+ attrs => [ 'uid', 'kolabDelegate' ]);
if( !$mesg->code && $mesg->count() > 0 ) {
mylog($syslog_priority, "LDAP search returned ".$mesg->count()." objects") if $verbose;
foreach my $entry ( $mesg->entries ) {
mylog($syslog_priority, lc($entry->get_value('uid')." is allowed to use ".$sender)) if $verbose;
push @result, lc($entry->get_value('uid'));
+ my $delegate;
+ for $delegate ($entry->get_value('kolabDelegate')) {
+ $delegate = lookup_uid($delegate);
+ mylog($syslog_priority, lc($delegate)." is a delegate of ".$sender) if $verbose;
+ push @result, lc($delegate);
+ }
}
} elsif( $mesg->code && $mesg->code != LDAP_NO_SUCH_OBJECT ) {
if( $tries++ <= $ldap_max_tries ) {
More information about the commits
mailing list