This is an automated email from the ASF dual-hosted git repository. vnick pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/guacamole-manual.git
commit 0e754aae6c179734902f111d716c5779d7c9d317 Merge: 9ee679d 33b72fd Author: Virtually Nick <[email protected]> AuthorDate: Mon May 15 12:36:58 2023 -0400 Merge 1.5.2 changes back to master. src/jdbc-auth.md | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --cc src/jdbc-auth.md index 848a35b,b9e6aae..0fa2ca8 --- a/src/jdbc-auth.md +++ b/src/jdbc-auth.md @@@ -580,18 -580,13 +580,26 @@@ to the database server : The password to use to access the client certificate store, if one is required. By default no password will be used. +`mysql-track-external-connection-history` +: Whether connection history records should be created for connections not + defined in the database. By default, external connection history will be + tracked unless this is explicitly disabled by setting this to "false". + +`mysql-enforce-access-windows-for-active-sessions` +: Whether time-based access windows should be enforced for active user sessions. + By default, users will be logged out when an access window closes, even if + they are currently logged in. To allow logged-in users to continue to use the + application after an access window closes, set this to "false". Users will + always be prevented from logging in outside of access windows regardless of + this setting. ++ + `mysql-batch-size` + : Controls how many objects may be retrieved from the database in a single + query. If more objects than this number are requested, retrieval of those + objects will be automatically and transparently split across multiple + queries. + + By default, MySQL/MariaDB queries will retrieve no more than 1000 objects. ::: :::{tab} PostgreSQL @@@ -670,18 -665,13 +678,28 @@@ abort queries that take too long. A value of 0 (the default) means the timeout is disabled. ++<<<<<<< HEAD +`postgresql-track-external-connection-history` +: Whether connection history records should be created for connections not + defined in the database. By default, external connection history will be + tracked unless this is explicitly disabled by setting this to "false". + +`postgresql-enforce-access-windows-for-active-sessions` +: Whether time-based access windows should be enforced for active user sessions. + By default, users will be logged out when an access window closes, even if + they are currently logged in. To allow logged-in users to continue to use the + application after an access window closes, set this to "false". Users will + always be prevented from logging in outside of access windows regardless of + this setting. ++======= + `postgresql-batch-size` + : Controls how many objects may be retrieved from the database in a single + query. If more objects than this number are requested, retrieval of those + objects will be automatically and transparently split across multiple + queries. + + By default, PostgreSQL queries will retrieve no more than 5000 objects. ++>>>>>>> staging/1.5.2 ::: :::{tab} SQL Server @@@ -714,18 -704,13 +732,28 @@@ the SQL Server installation. This property is optional, and most installations should work without the need to specify an instance name. ++<<<<<<< HEAD +`sqlserver-track-external-connection-history` +: Whether connection history records should be created for connections not + defined in the database. By default, external connection history will be + tracked unless this is explicitly disabled by setting this to "false". + +`sqlserver-enforce-access-windows-for-active-sessions` +: Whether time-based access windows should be enforced for active user sessions. + By default, users will be logged out when an access window closes, even if + they are currently logged in. To allow logged-in users to continue to use the + application after an access window closes, set this to "false". Users will + always be prevented from logging in outside of access windows regardless of + this setting. ++======= + `sqlserver-batch-size` + : Controls how many objects may be retrieved from the database in a single + query. If more objects than this number are requested, retrieval of those + objects will be automatically and transparently split across multiple + queries. + + By default, SQL Server queries will retrieve no more than 1000 objects. ++>>>>>>> staging/1.5.2 ::: #### Enforcing password policies
