aboutsummaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorTom Yu <tlyu@mit.edu>2014-08-02 14:20:35 -0400
committerTom Yu <tlyu@mit.edu>2014-08-02 14:20:35 -0400
commit20de23910012dcda1fd06d6ac7153adf2c0589b8 (patch)
tree056b8010c1a8f8083ecd2a553a635bdc5408479d /doc
parent71dff2ba654260a870dfc2adc35b2a90a458ce35 (diff)
downloadkrb5-20de23910012dcda1fd06d6ac7153adf2c0589b8.zip
krb5-20de23910012dcda1fd06d6ac7153adf2c0589b8.tar.gz
krb5-20de23910012dcda1fd06d6ac7153adf2c0589b8.tar.bz2
Document unlockiter
ticket: 7977
Diffstat (limited to 'doc')
-rw-r--r--doc/admin/admin_commands/kadmin_local.rst13
-rw-r--r--doc/admin/conf_files/kdc_conf.rst7
2 files changed, 20 insertions, 0 deletions
diff --git a/doc/admin/admin_commands/kadmin_local.rst b/doc/admin/admin_commands/kadmin_local.rst
index 8409303..faf7105 100644
--- a/doc/admin/admin_commands/kadmin_local.rst
+++ b/doc/admin/admin_commands/kadmin_local.rst
@@ -154,6 +154,19 @@ Supported options for the DB2 module are:
**-x dbname=**\ \*filename*
Specifies the base filename of the DB2 database.
+ **-x lockiter**
+ Make iteration operations hold the lock for the duration of
+ the entire operation, rather than temporarily releasing the
+ lock while handling each principal. This is the default
+ behavior, but this option exists to allow command line
+ override of a [dbmodules] setting. First introduced in
+ release 1.13.
+
+ **-x unlockiter**
+ Make iteration operations unlock the database for each
+ principal, instead of holding the lock for the duration of the
+ entire operation. First introduced in release 1.13.
+
Supported options for the LDAP module are:
**-x host=**\ *ldapuri*
diff --git a/doc/admin/conf_files/kdc_conf.rst b/doc/admin/conf_files/kdc_conf.rst
index eaeabda..d6bfd0e 100644
--- a/doc/admin/conf_files/kdc_conf.rst
+++ b/doc/admin/conf_files/kdc_conf.rst
@@ -456,6 +456,13 @@ The following tags may be specified in a [dbmodules] subsection:
**ldap_kdc_sasl_authcid** or **ldap_kadmind_sasl_authcid** names
for SASL authentication. This file must be kept secure.
+**unlockiter**
+ If set to ``true``, this DB2-specific tag causes iteration
+ operations to release the database lock while processing each
+ principal. Setting this flag to ``true`` can prevent extended
+ blocking of KDC or kadmin operations when dumps of large databases
+ are in progress. First introduced in release 1.13.
+
The following tag may be specified directly in the [dbmodules]
section to control where database modules are loaded from: