You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@guacamole.apache.org by mj...@apache.org on 2017/12/11 22:43:35 UTC
[1/3] guacamole-manual git commit: GUACAMOLE-243: Add documentation
for referral parameters.
Repository: guacamole-manual
Updated Branches:
refs/heads/staging/0.9.14 7cd86517a -> da3aa5e66
GUACAMOLE-243: Add documentation for referral parameters.
Project: http://git-wip-us.apache.org/repos/asf/guacamole-manual/repo
Commit: http://git-wip-us.apache.org/repos/asf/guacamole-manual/commit/eab8ae3d
Tree: http://git-wip-us.apache.org/repos/asf/guacamole-manual/tree/eab8ae3d
Diff: http://git-wip-us.apache.org/repos/asf/guacamole-manual/diff/eab8ae3d
Branch: refs/heads/staging/0.9.14
Commit: eab8ae3da4655e6677d44a81ddad982feb28d03f
Parents: 4e18295
Author: Nick Couchman <vn...@apache.org>
Authored: Mon Oct 23 20:41:42 2017 -0400
Committer: Nick Couchman <vn...@apache.org>
Committed: Mon Oct 23 20:41:42 2017 -0400
----------------------------------------------------------------------
src/chapters/ldap-auth.xml | 29 +++++++++++++++++++++++++++++
1 file changed, 29 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/guacamole-manual/blob/eab8ae3d/src/chapters/ldap-auth.xml
----------------------------------------------------------------------
diff --git a/src/chapters/ldap-auth.xml b/src/chapters/ldap-auth.xml
index b08cc5e..5c38113 100644
--- a/src/chapters/ldap-auth.xml
+++ b/src/chapters/ldap-auth.xml
@@ -404,6 +404,35 @@ dn: cn={4}guacConfigGroup,cn=schema,cn=config
aliases.</para>
</listitem>
</varlistentry>
+ <varlistentry>
+ <term><property>ldap-follow-referrals</property></term>
+ <listitem>
+ <para>This option controls whether or not the LDAP connection follows referrals when
+ processing search results from a LDAP operation. Referrals can be pointers to other
+ parts of an LDAP tree, or to a different server/connection altogether. This is a boolean
+ parameter, with valid options of "true" or "false." The default is false. When disabled,
+ LDAP referrals will be ignored when encounterd by the Guacamole LDAP client and the client
+ will move on to the next result. When enabled, the LDAP client will follow the referral and
+ process results within the referral, subject to the maximum hops parameter below.</para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><property>ldap-max-referral-hops</property></term>
+ <listitem>
+ <para>This option controls the maximum number of referrals that will be processed before the
+ LDAP client refuses to follow any more referrals. The default is 5. If the ldap-follow-referrals
+ property is set to false (the default), this option has no effect. If the ldap-follow-referrals option
+ is set to true, this will limit the depth of referrals followed to the number specified.</para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><property>ldap-operation-timeout</property></term>
+ <para>This option sets the timeout, in seconds, of any single LDAP operation. The default is 30 seconds.
+ When this timeout is reached LDAP operations will be aborted.
+ </para>
+ <listitem>
+ </listitem>
+ </varlistentry>
</variablelist>
<para>Again, even if the defaults are sufficient for the other properties, <emphasis>you
must still specify the <property>ldap-user-base-dn</property>
[3/3] guacamole-manual git commit: GUACAMOLE-243: Merge documentation
for new LDAP referral parameters.
Posted by mj...@apache.org.
GUACAMOLE-243: Merge documentation for new LDAP referral parameters.
Project: http://git-wip-us.apache.org/repos/asf/guacamole-manual/repo
Commit: http://git-wip-us.apache.org/repos/asf/guacamole-manual/commit/da3aa5e6
Tree: http://git-wip-us.apache.org/repos/asf/guacamole-manual/tree/da3aa5e6
Diff: http://git-wip-us.apache.org/repos/asf/guacamole-manual/diff/da3aa5e6
Branch: refs/heads/staging/0.9.14
Commit: da3aa5e66740cb19424a11f6417124f902d619dc
Parents: 7cd8651 86a0afc
Author: Michael Jumper <mj...@apache.org>
Authored: Mon Dec 11 14:41:46 2017 -0800
Committer: Michael Jumper <mj...@apache.org>
Committed: Mon Dec 11 14:41:46 2017 -0800
----------------------------------------------------------------------
src/chapters/ldap-auth.xml | 28 ++++++++++++++++++++++++++++
1 file changed, 28 insertions(+)
----------------------------------------------------------------------
[2/3] guacamole-manual git commit: GUACAMOLE-243: Minor tweaks to
language and style.
Posted by mj...@apache.org.
GUACAMOLE-243: Minor tweaks to language and style.
Project: http://git-wip-us.apache.org/repos/asf/guacamole-manual/repo
Commit: http://git-wip-us.apache.org/repos/asf/guacamole-manual/commit/86a0afce
Tree: http://git-wip-us.apache.org/repos/asf/guacamole-manual/tree/86a0afce
Diff: http://git-wip-us.apache.org/repos/asf/guacamole-manual/diff/86a0afce
Branch: refs/heads/staging/0.9.14
Commit: 86a0afce2c57f6479cb201ca0f61acfe57c104a3
Parents: eab8ae3
Author: Nick Couchman <vn...@apache.org>
Authored: Thu Nov 30 08:44:24 2017 -0500
Committer: Nick Couchman <vn...@apache.org>
Committed: Thu Nov 30 08:44:24 2017 -0500
----------------------------------------------------------------------
src/chapters/ldap-auth.xml | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/guacamole-manual/blob/86a0afce/src/chapters/ldap-auth.xml
----------------------------------------------------------------------
diff --git a/src/chapters/ldap-auth.xml b/src/chapters/ldap-auth.xml
index 5c38113..bc3bc5e 100644
--- a/src/chapters/ldap-auth.xml
+++ b/src/chapters/ldap-auth.xml
@@ -407,8 +407,8 @@ dn: cn={4}guacConfigGroup,cn=schema,cn=config
<varlistentry>
<term><property>ldap-follow-referrals</property></term>
<listitem>
- <para>This option controls whether or not the LDAP connection follows referrals when
- processing search results from a LDAP operation. Referrals can be pointers to other
+ <para>This option controls whether or not the LDAP module follow referrals when
+ processing search results from a LDAP search. Referrals can be pointers to other
parts of an LDAP tree, or to a different server/connection altogether. This is a boolean
parameter, with valid options of "true" or "false." The default is false. When disabled,
LDAP referrals will be ignored when encounterd by the Guacamole LDAP client and the client
@@ -428,8 +428,7 @@ dn: cn={4}guacConfigGroup,cn=schema,cn=config
<varlistentry>
<term><property>ldap-operation-timeout</property></term>
<para>This option sets the timeout, in seconds, of any single LDAP operation. The default is 30 seconds.
- When this timeout is reached LDAP operations will be aborted.
- </para>
+ When this timeout is reached LDAP operations will be aborted.</para>
<listitem>
</listitem>
</varlistentry>