From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Wed, 4 Sep 2013 22:03:21 +0000 (+0100)
Subject: break out puser; call it early during choose
X-Git-Tag: test~28
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ijackson/git?p=d.git;a=commitdiff_plain;h=0d3dadddf3329d03c9920eb5dd458eaed99c9a48

break out puser; call it early during choose
---

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();