chiark
/
gitweb
/
~ijackson
/
evade-mail-usrlocal.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
e8a3017
)
support genopts
author
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Wed, 4 Sep 2013 22:39:57 +0000
(23:39 +0100)
committer
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Wed, 4 Sep 2013 22:39:57 +0000
(23:39 +0100)
service
patch
|
blob
|
history
diff --git
a/service
b/service
index 2774f49073ac91c58dd3f2a921e8741554d980ab..14852b233827d0e6ac977681163c14aa51836596 100755
(executable)
--- a/
service
+++ b/
service
@@
-2,7
+2,7
@@
our $usage1 = <<'END';
usage: ../fyvzl [<options>] <database-file> <action> <arg>...
options
our $usage1 = <<'END';
usage: ../fyvzl [<options>] <database-file> <action> <arg>...
options
- -l<minrandlength> (for create/choose,
number of letters
)
+ -l<minrandlength> (for create/choose,
minimum randlength
)
-m<maxperuser>
-d<dom>
-q<qualdom>
-m<maxperuser>
-d<dom>
-q<qualdom>
@@
-25,7
+25,13
@@
privileged actions
insert-exact <addr> <user> <redirect> <comment>
donate <addr> <user>
enable-user|disable-user <user>
insert-exact <addr> <user> <redirect> <comment>
donate <addr> <user>
enable-user|disable-user <user>
+default generation method is alphanum
END
END
+our %usage_genopts = (
+'alphanum' => <<END
+ -l<randlength> (number of letters+digits)
+END
+);
#/
use strict;
#/
use strict;
@@
-403,6
+409,10
@@
while (@ARGV) {
$showcomment = 1;
} elsif (s/^-h/-/) {
print $usage1.$usage2.$usage3 or die $!;
$showcomment = 1;
} elsif (s/^-h/-/) {
print $usage1.$usage2.$usage3 or die $!;
+ foreach my $meth (qw(alphanum)) {
+ print "genopts for $meth generation method\n" or die $!;
+ print $usage_genopts{$meth} or die $!;
+ }
exit 0;
} else {
die "unknown option \`$_'\n";
exit 0;
} else {
die "unknown option \`$_'\n";