diff options
| author | Russ Allbery <rra@stanford.edu> | 2007-11-15 05:49:05 +0000 |
|---|---|---|
| committer | Russ Allbery <rra@stanford.edu> | 2007-11-15 05:49:05 +0000 |
| commit | 480c823eca7676ae610642b2357af9c12e5c2e24 (patch) | |
| tree | 9258f369e8599fa7b630bee81e20815dd9dc3b67 | |
| parent | 2393ffbc3c52c6552e00212d5209d6b870a55d4e (diff) | |
Use the right remctld configuration for the ACL verifier. Don't produce
Perl warnings if the NetDB roles are empty.
| -rw-r--r-- | perl/Wallet/ACL/NetDB.pm | 1 | ||||
| -rwxr-xr-x | perl/t/verifier.t | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/perl/Wallet/ACL/NetDB.pm b/perl/Wallet/ACL/NetDB.pm index 23efa9d..6437ebc 100644 --- a/perl/Wallet/ACL/NetDB.pm +++ b/perl/Wallet/ACL/NetDB.pm @@ -99,6 +99,7 @@ sub check { } } while ($output->type eq 'output'); if ($status == 0) { + $roles ||= ''; my @roles = split (' ', $roles); for my $role (@roles) { return 1 if $role eq 'admin'; diff --git a/perl/t/verifier.t b/perl/t/verifier.t index 467115f..d401146 100755 --- a/perl/t/verifier.t +++ b/perl/t/verifier.t @@ -51,7 +51,7 @@ sub spawn_remctld { } elsif ($pid == 0) { open (STDERR, '>&STDOUT') or die "cannot redirect stderr: $!\n"; exec ($path, '-m', '-p', 14373, '-s', $principal, '-P', 'test-pid', - '-f', 't/data/keytab.conf', '-S', '-F', '-k', $keytab) == 0 + '-f', 't/data/netdb.conf', '-S', '-F', '-k', $keytab) == 0 or die "cannot exec $path: $!\n"; } else { my $tries = 0; |