chiark / gitweb /
qualdom not dom
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Fri, 30 Aug 2013 13:37:52 +0000 (14:37 +0100)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Fri, 30 Aug 2013 13:37:52 +0000 (14:37 +0100)
fyvzl
fyvzl.service

diff --git a/fyvzl b/fyvzl
index b8ab577d68791e08700ecf27ab2d8bad3e648048..97b1d9b4e7dca71e2d9bb72a96e046445be592a1 100755 (executable)
--- 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";
     }
index 5f43d5d403202d44e0fcc8883574ab1be4a55a42..b46e8c31251e584b009a6848a3305a0c0e852c98 100644 (file)
@@ -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