From 36acaffef24c2b0db9ff67a29732388f685644d2 Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Fri, 30 Aug 2013 14:39:57 +0100
Subject: [PATCH] print doms

---
 fyvzl         | 11 ++++++++---
 fyvzl.service |  2 +-
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/fyvzl b/fyvzl
index 97b1d9b..3ccae97 100755
--- a/fyvzl
+++ b/fyvzl
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -w
 #
-# usage: ../fyvzl [-lLENGTH] [-mMAXPERUSER] [-qQUALDOM] DATABASE-FILE ACTION ARG
+# usage: ../fyvzl [-lLENGTH] [-mMAXPERUSER] [-dDOM] [-qQUALDOM] DATABASE-FILE ACTION ARG
 # actions
 #   create [REDIRECT-TO]
 #   update LOCAL-PART REDIRECT-TO
@@ -22,6 +22,7 @@ our $randlength = 6;
 our $maxperuser = 10000;
 our $qualdom;
 our $dbh;
+our $dom;
 our $user;
 our $priv;
 
@@ -53,10 +54,12 @@ sub prow ($) {
 	print "# user $u ".(isdisabled($u) ? 'disabled' : 'enabled')."\n";
 	$last_u = $u;
     }
+    my $pa = $row->{'localpart'};
+    $pa .= '@'.$dom if defined $dom;
     if (defined $row->{'redirect'}) {
-	print "$row->{'localpart'}: $row->{'redirect'}\n";
+	print "$pa: $row->{'redirect'}\n";
     } else {
-	print "# reject $row->{'localpart'}\n";
+	print "# reject $pa\n";
     }
 }
 
@@ -216,6 +219,8 @@ while (@ARGV) {
 	$randlength = $1;
     } elsif (m/^-m(\d+)$/) {
 	$maxperuser = $1;
+    } elsif (m/^-d(\S+)$/) {
+	$dom = $1;
     } elsif (m/^-q(\S+)$/) {
 	$qualdom = $1;
     } else {
diff --git a/fyvzl.service b/fyvzl.service
index 91d2fe0..e9d1921 100644
--- a/fyvzl.service
+++ b/fyvzl.service
@@ -6,6 +6,6 @@ if ( grep calling-user-shell /etc/shells
 	no-set-environment
 	no-disconnect-hup
 	no-suppress-args
-	execute /usr/local/lib/fyvzl/fyvzl \
+	execute /usr/local/lib/fyvzl/fyvzl -dfyvzl.net \
 		-qchiark.greenend.org.uk /var/lib/mail/fyvzl.db
 fi
-- 
2.30.2