From 0d3dadddf3329d03c9920eb5dd458eaed99c9a48 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Wed, 4 Sep 2013 23:03:21 +0100 Subject: [PATCH] break out puser; call it early during choose --- service | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/service b/service index 1d64c5b..44f4442 100755 --- a/service +++ b/service @@ -73,14 +73,19 @@ sub isdisabled ($) { return !!$row; } -sub prow ($) { - my ($row) = @_; - my $u = $row->{'user'}; +sub puser ($) { + my ($u) = @_; our $last_u; if (!defined $last_u or $last_u ne $u) { print "# user $u ".(isdisabled($u) ? 'disabled' : 'enabled')."\n"; $last_u = $u; } +} + +sub prow ($) { + my ($row) = @_; + my $u = $row->{'user'}; + puser($u); my $pa = $row->{'localpart'}; $pa .= '@'.$dom if defined $dom; if (length $row->{'redirect'}) { @@ -195,6 +200,7 @@ sub action_choose { my $template = rhsargs({'redirect'=>$user, 'comment'=>''}); $template->{'user'} = $user; prepare_create(); + puser($user); my %s; while (keys %s < 10) { my $s = generate_local_part(); -- 2.30.2