From 480c823eca7676ae610642b2357af9c12e5c2e24 Mon Sep 17 00:00:00 2001 From: Russ Allbery Date: Thu, 15 Nov 2007 05:49:05 +0000 Subject: Use the right remctld configuration for the ACL verifier. Don't produce Perl warnings if the NetDB roles are empty. --- perl/Wallet/ACL/NetDB.pm | 1 + perl/t/verifier.t | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'perl') 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; -- cgit v1.2.3