From c2ca6dbc6caa51283a8fa587a622bcd870c97d93 Mon Sep 17 00:00:00 2001 From: Russ Allbery Date: Fri, 7 Dec 2007 00:51:07 +0000 Subject: 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. --- server/wallet-backend | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'server') 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]"; } } -- cgit v1.2.3