our $usage2 = <<'END';
actions
create [REDIRECT] [#COMMENT] (default for REDIRECT is your username)
- update LOCAL-PART [REDIRECT] [#COMMENT]
- show LOCAL-PART
+ update ADDR [REDIRECT] [#COMMENT]
+ show ADDR
list
list-actions
empty string for REDIRECT means reject
our $usage3 = <<'END';
privileged actions
list-user USER
- insert-exact LOCAL-PART USER REDIRECT COMMENT
- donate LOCAL-PART USER
+ insert-exact ADDR USER REDIRECT COMMENT
+ donate ADDR USER
enable-user|disable-user USER
END
return $v;
}
+sub nextarg_addr () {
+ my $addr = nextarg;
+ return $addr if $addr !~ m/\@/;
+ die "address not in correct domain (\@$dom)\n" unless $' eq $dom; #';
+ return $`; #`;
+}
+
sub nomoreargs () {
die "too many arguments\n" if @ARGV;
}
}
sub action_update {
- my $localpart = nextarg;
+ my $localpart = nextarg_addr;
my $updrow = rhsargs({});
nomoreargs;
begin_row($localpart);
}
sub action_show {
- my $localpart = nextarg;
+ my $localpart = nextarg_addr;
nomoreargs;
my $row = begin_row($localpart);
prow($row);
sub action_insert_exact {
die unless $priv;
my $row = { };
- $row->{'localpart'} = nextarg;
+ $row->{'localpart'} = nextarg_addr;
$row->{'user'} = $user = nextarg;
$row->{'redirect'} = nextarg;
$row->{'comment'} = nextarg;
sub action_donate {
die unless $priv;
- my $localpart = nextarg;
+ my $localpart = nextarg_addr;
my $newuser = nextarg;
nomoreargs;
begin_row($localpart);
$user = ((getpwuid $<)[0]) or die;
}
-$usage2 .= "LOCAL-PART is implicitly qualified with \@$dom\n"
+$usage2 .= "ADDR may be a local part, implicitly qualified with \@$dom\n"
if defined $qualdom;
$usage2 .= "REDIRECT is implicitly qualified with \@$qualdom if it has no \@\n"
if defined $qualdom;