summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRuss Allbery <eagle@eyrie.org>2018-05-27 17:13:07 -0700
committerRuss Allbery <eagle@eyrie.org>2018-05-27 17:58:38 -0700
commitb126269d161880e6ed77764c3fac33337ad6937a (patch)
tree885d49e1468ff56b6ba8fb1de49e65783b6fc9b9
parentf36c9896f242ae0ec894daa2092600ab81197999 (diff)
Reorganize AD configuration options
Move options up with other keytab backend options except for the bucket for keytabs, which does belong in the section on retrieving existing keytabs.
-rw-r--r--perl/lib/Wallet/Config.pm26
1 files changed, 13 insertions, 13 deletions
diff --git a/perl/lib/Wallet/Config.pm b/perl/lib/Wallet/Config.pm
index 09db609..99aa21a 100644
--- a/perl/lib/Wallet/Config.pm
+++ b/perl/lib/Wallet/Config.pm
@@ -1,7 +1,7 @@
# Wallet::Config -- Configuration handling for the wallet server
#
# Written by Russ Allbery <eagle@eyrie.org>
-# Copyright 2016 Russ Allbery <eagle@eyrie.org>
+# Copyright 2016, 2018 Russ Allbery <eagle@eyrie.org>
# Copyright 2007, 2008, 2010, 2013, 2014, 2015
# The Board of Trustees of the Leland Stanford Junior University
#
@@ -422,14 +422,23 @@ Active Directory (KEYTAB_KRBTYPE is set to C<AD>).
=item AD_BASE_DN
-The base distinguished name of the ActiveDirectory instance. This is
-use when Wallet uses LDAP directly to examine objects in Active
-Directory.
+The base distinguished name of the ActiveDirectory instance. This is use
+when Wallet uses LDAP directly to examine objects in Active Directory.
=cut
our $AD_BASE_DN;
+=item AD_CACHE
+
+Specifies the ticket cache to use when manipulating Active Directory objects.
+The ticket cache must be for a principal able to bind to Active Directory and
+run B<msktutil>.
+
+=cut
+
+our $AD_CACHE;
+
=item AD_COMPUTER_RDN
The LDAP base DN for computer objects inside Active Directory. All
@@ -594,15 +603,6 @@ will be used.
our $KEYTAB_REMCTL_PORT;
-=item AD_CACHE
-
-The ticket cache that hold credentials used to access the
-ActiveDirectory KDC. This must be created and maintained externally.
-
-=cut
-
-our $AD_CACHE;
-
=item AD_KEYTAB_BUCKET
The path to store a copy of keytabs created. This is required for the