aboutsummaryrefslogtreecommitdiff
path: root/perl/lib/Wallet/Kadmin
diff options
context:
space:
mode:
authorRuss Allbery <eagle@eyrie.org>2016-01-16 16:13:03 -0800
committerRuss Allbery <eagle@eyrie.org>2016-01-16 16:13:03 -0800
commit269b5a2cdb9b2f2c65423081f532db42a2ec55e4 (patch)
treebc65f5459a24e9383a6b54f860dd10821092664e /perl/lib/Wallet/Kadmin
parentd2fde5b8330cab6bd6210ef99a628b1897676897 (diff)
Add documentation of the Active Directory support
Also remove some configuration checks that aren't required, and unify handling of some configuration options.
Diffstat (limited to 'perl/lib/Wallet/Kadmin')
-rw-r--r--perl/lib/Wallet/Kadmin/AD.pm8
1 files changed, 3 insertions, 5 deletions
diff --git a/perl/lib/Wallet/Kadmin/AD.pm b/perl/lib/Wallet/Kadmin/AD.pm
index 4efc643..97bf2bf 100644
--- a/perl/lib/Wallet/Kadmin/AD.pm
+++ b/perl/lib/Wallet/Kadmin/AD.pm
@@ -130,16 +130,14 @@ sub get_ad_keytab {
# that error output.
sub msktutil {
my ($self, $args_ref) = @_;
- unless (defined($Wallet::Config::KEYTAB_PRINCIPAL)
- and defined($Wallet::Config::KEYTAB_FILE)
+ unless (defined($Wallet::Config::KEYTAB_HOST)
and defined($Wallet::Config::KEYTAB_REALM))
{
die "keytab object implementation not configured\n";
}
- unless (defined($Wallet::Config::AD_SERVER)
+ unless (defined($Wallet::Config::AD_CACHE)
and defined($Wallet::Config::AD_COMPUTER_DN)
- and defined($Wallet::Config::AD_USER_DN)
- and defined($Wallet::Config::AD_KEYTAB_BUCKET))
+ and defined($Wallet::Config::AD_USER_DN))
{
die "Active Directory support not configured\n";
}