From aaca3cc7cb413af1f566ac8d7a601d3c142e89f0 Mon Sep 17 00:00:00 2001 From: Guilhem Moulin Date: Mon, 24 Sep 2012 15:44:23 +0200 Subject: The "pending" flag should be removed last. --- misc/mklist/mklist.pl | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) (limited to 'misc') diff --git a/misc/mklist/mklist.pl b/misc/mklist/mklist.pl index 37c05e5..ac5f526 100755 --- a/misc/mklist/mklist.pl +++ b/misc/mklist/mklist.pl @@ -153,17 +153,6 @@ my @cmds = $transport eq 'mailman' ? qw/admin bounces confirm join leave owner r die 'Unknown transport'; -####################################################################### -# -# Add the LDAP commands under the list's root DN, and remove the -# 'pending' status. -{ - my $fp = &auth(); - $fp->list->add_commands($list, \@cmds); - $fp->done; -} - - ####################################################################### # # Create/update the Postfix lookup table. @@ -191,6 +180,19 @@ my @cmds = $transport eq 'mailman' ? qw/admin bounces confirm join leave owner r } +####################################################################### +# +# Add the LDAP commands under the list's root DN, and remove the +# 'pending' status. +{ + my $fp = &auth(); + $fp->list->add_commands($list, \@cmds); + $fp->done; +} + + +####################################################################### +# # Append a list command to the lookup table. sub print_transport { my $fh = shift; @@ -202,7 +204,7 @@ sub print_transport { or die "Cannot printf: $!"; } -# Authenticate +# Authenticate to the LDAP directory. sub auth { Fripost::Schema::->auth( undef, $config->{ldap_bind_pw} , ldap_bind_dn => join(',',@{$config->{ldap_bind_dn}}) -- cgit v1.2.3