From 6d78da872421d1142ac0c8d7a8e649de260c49f4 Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Fri, 30 Aug 2013 14:37:52 +0100
Subject: [PATCH] qualdom not dom

---
 fyvzl         | 12 ++++++------
 fyvzl.service |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/fyvzl b/fyvzl
index b8ab577..97b1d9b 100755
--- a/fyvzl
+++ b/fyvzl
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -w
 #
-# usage: ../fyvzl [-lLENGTH] [-mMAXPERUSER] [-dDEFDOM] DATABASE-FILE ACTION ARG
+# usage: ../fyvzl [-lLENGTH] [-mMAXPERUSER] [-qQUALDOM] DATABASE-FILE ACTION ARG
 # actions
 #   create [REDIRECT-TO]
 #   update LOCAL-PART REDIRECT-TO
@@ -20,7 +20,7 @@ use POSIX;
 
 our $randlength = 6;
 our $maxperuser = 10000;
-our $defdom;
+our $qualdom;
 our $dbh;
 our $user;
 our $priv;
@@ -76,8 +76,8 @@ sub goodrand ($) {
 sub qualify ($) {
     my ($t) = @_;
     return $t if $t =~ m/\@/;
-    die "unqualified redirection target\n" unless defined $defdom;
-    return $t.'@'.$defdom;
+    die "unqualified redirection target\n" unless defined $qualdom;
+    return $t.'@'.$qualdom;
 }
 
 sub insertrow ($) {
@@ -216,8 +216,8 @@ while (@ARGV) {
 	$randlength = $1;
     } elsif (m/^-m(\d+)$/) {
 	$maxperuser = $1;
-    } elsif (m/^-d(\S+)$/) {
-	$defdom = $1;
+    } elsif (m/^-q(\S+)$/) {
+	$qualdom = $1;
     } else {
 	die "unknown option \`$_'\n";
     }
diff --git a/fyvzl.service b/fyvzl.service
index 5f43d5d..b46e8c3 100644
--- a/fyvzl.service
+++ b/fyvzl.service
@@ -5,5 +5,5 @@ if ( grep calling-user-shell /etc/shells
 	no-set-environment
 	no-disconnect-hup
 	execute /usr/local/lib/fyvzl/fyvzl \
-		-dchiark.greenend.org.uk /var/lib/mail/fyvzl.db
+		-qchiark.greenend.org.uk /var/lib/mail/fyvzl.db
 fi
-- 
2.30.2