Merge changes from patch branch back to main.

apache · Sep 2, 2024 · f95a218 · f95a218
2 parents bef7e30 + 3de0a1e
commit f95a218
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 12 deletions.
diff --git a/...e/src/main/java/org/apache/guacamole/auth/jdbc/tunnel/AbstractGuacamoleTunnelService.java b/...e/src/main/java/org/apache/guacamole/auth/jdbc/tunnel/AbstractGuacamoleTunnelService.java
@@ -80,57 +80,57 @@ public abstract class AbstractGuacamoleTunnelService implements GuacamoleTunnelS
     /**
      * Logger for this class.
      */
-    private final Logger logger = LoggerFactory.getLogger(AbstractGuacamoleTunnelService.class);
+    private static final Logger logger = LoggerFactory.getLogger(AbstractGuacamoleTunnelService.class);
 
     /**
      * The prefix that will be used to generate JDBC tokens.
      */
-    private final String JDBC_TOKEN_PREFIX = "JDBC_";
+    private static final String JDBC_TOKEN_PREFIX = "JDBC_";
 
     /**
      * The token that contains the date the connection was started.
      */
-    private final String JDBC_DATE_TOKEN = JDBC_TOKEN_PREFIX + "STARTDATE";
+    private static final String JDBC_DATE_TOKEN = JDBC_TOKEN_PREFIX + "STARTDATE";
 
     /**
      * The format of the date in the date token.
      */
-    private final String JDBC_DATE_TOKEN_FORMAT = "yyyyMMdd";
+    private static final String JDBC_DATE_TOKEN_FORMAT = "yyyyMMdd";
 
     /**
      * The token that contains the start time of the connection.
      */
-    private final String JDBC_TIME_TOKEN = JDBC_TOKEN_PREFIX + "STARTTIME";
+    private static final String JDBC_TIME_TOKEN = JDBC_TOKEN_PREFIX + "STARTTIME";
 
     /**
      * The format of the time in the time token.
      */
-    private final String JDBC_TIME_TOKEN_FORMAT = "HHmmss";
+    private static final String JDBC_TIME_TOKEN_FORMAT = "HHmmss";
 
     /**
      * The token that contains the connection name.
      */
-    private final String JDBC_CONNECTION_NAME_TOKEN = JDBC_TOKEN_PREFIX + "CONNECTION_NAME";
+    private static final String JDBC_CONNECTION_NAME_TOKEN = JDBC_TOKEN_PREFIX + "CONNECTION_NAME";
 
     /**
      * The token that contains the connection identifier.
      */
-    private final String JDBC_CONNECTION_ID_TOKEN = JDBC_TOKEN_PREFIX + "CONNECTION_ID";
+    private static final String JDBC_CONNECTION_ID_TOKEN = JDBC_TOKEN_PREFIX + "CONNECTION_ID";
 
     /**
      * The token that contains the hostname configured in the connection parameters.
      */
-    private final String JDBC_CONNECTION_HOSTNAME_TOKEN = JDBC_TOKEN_PREFIX + "HOSTNAME";
+    private static final String JDBC_CONNECTION_HOSTNAME_TOKEN = JDBC_TOKEN_PREFIX + "HOSTNAME";
 
     /**
      * The name of the parameter containing the hostname in the configuration.
      */
-    private final String JDBC_CONNECTION_HOSTNAME_TOKEN_PARAMETER = "hostname";
+    private static final String JDBC_CONNECTION_HOSTNAME_TOKEN_PARAMETER = "hostname";
 
     /**
      * The token containing the protocol configured in the connection.
      */
-    private final String JDBC_CONNECTION_PROTOCOL_TOKEN = JDBC_TOKEN_PREFIX + "PROTOCOL";
+    private static final String JDBC_CONNECTION_PROTOCOL_TOKEN = JDBC_TOKEN_PREFIX + "PROTOCOL";
 
     /**
      * Mapper for accessing connections.

diff --git a/extensions/guacamole-auth-ldap/schema/guacConfigGroup.ldif b/extensions/guacamole-auth-ldap/schema/guacConfigGroup.ldif
@@ -26,6 +26,7 @@ olcAttributeTypes: ( 1.3.6.1.4.1.38971.1.1.1 NAME 'guacConfigProtocol'
 olcAttributeTypes: ( 1.3.6.1.4.1.38971.1.1.2 NAME 'guacConfigParameter'
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
 olcAttributeTypes: ( 1.3.6.1.4.1.38971.1.1.3 NAME 'guacConfigProxyHostname'
+  SINGLE-VALUE
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
 olcAttributeTypes: ( 1.3.6.1.4.1.38971.1.1.4 NAME 'guacConfigProxyPort'
   SINGLE-VALUE

diff --git a/extensions/guacamole-auth-ldap/schema/guacConfigGroup.schema b/extensions/guacamole-auth-ldap/schema/guacConfigGroup.schema
@@ -24,6 +24,7 @@ attributetype ( 1.3.6.1.4.1.38971.1.1.2 NAME 'guacConfigParameter'
     SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
 
 attributetype ( 1.3.6.1.4.1.38971.1.1.3 NAME 'guacConfigProxyHostname'
+    SINGLE-VALUE
     SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
 
 attributetype ( 1.3.6.1.4.1.38971.1.1.4 NAME 'guacConfigProxyPort'

diff --git a/...-auth-ldap/src/main/java/org/apache/guacamole/auth/ldap/connection/ConnectionService.java b/...-auth-ldap/src/main/java/org/apache/guacamole/auth/ldap/connection/ConnectionService.java
@@ -87,7 +87,7 @@ public class ConnectionService {
     public static final String LDAP_ATTRIBUTE_PROXY_PORT = "guacConfigProxyPort";
 
     /**
-     * The name of the LDAP attribute that stores guacd proxy hostname.
+     * The name of the LDAP attribute that stores guacd proxy encryption method.
      */
     public static final String LDAP_ATTRIBUTE_PROXY_ENCRYPTION = "guacConfigProxyEncryption";