summaryrefslogtreecommitdiff
path: root/server
diff options
context:
space:
mode:
authorRuss Allbery <rra@stanford.edu>2007-12-07 00:51:07 +0000
committerRuss Allbery <rra@stanford.edu>2007-12-07 00:51:07 +0000
commitc2ca6dbc6caa51283a8fa587a622bcd870c97d93 (patch)
tree47526cc3cc5ed78b52d128e1012aeb78f075112c /server
parent2e9f1bbdab7ee4cbf9fba8b5c99cb3e970f35f4b (diff)
Check a default creation ACL first before the ADMIN ACL when deciding
whether we can auto-create a non-existent ACL, since creating one with the ADMIN ACL doesn't create a useful object. Allow @ in wallet-backend arguments so that principal names can be passed in.
Diffstat (limited to 'server')
-rwxr-xr-xserver/wallet-backend2
1 files changed, 1 insertions, 1 deletions
diff --git a/server/wallet-backend b/server/wallet-backend
index 4af7490..e32581c 100755
--- a/server/wallet-backend
+++ b/server/wallet-backend
@@ -120,7 +120,7 @@ sub check_args {
my %exclude = map { $_ => 1 } @$exclude;
for (my $i = 1; $i <= @args; $i++) {
next if $exclude{$i};
- unless ($args[$i - 1] =~ m,^[\w_/.-]*\z,) {
+ unless ($args[$i - 1] =~ m,^[\w_/\@.-]*\z,) {
error "invalid characters in argument: $args[$i - 1]";
}
}