From fe944e99190d8d5504d19e99df0e22c33b5de922 Mon Sep 17 00:00:00 2001 From: Michael Jumper Date: Thu, 22 Aug 2013 17:54:57 -0700 Subject: [PATCH] Remove whitespace errors at end of non-blank lines as well. --- .../net/auth/ldap/LDAPAuthenticationProvider.java | 10 +++++----- .../auth/ldap/properties/LDAPGuacamoleProperties.java | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/extensions/guacamole-auth-ldap/src/main/java/net/sourceforge/guacamole/net/auth/ldap/LDAPAuthenticationProvider.java b/extensions/guacamole-auth-ldap/src/main/java/net/sourceforge/guacamole/net/auth/ldap/LDAPAuthenticationProvider.java index 60936948e..41e4c24d8 100644 --- a/extensions/guacamole-auth-ldap/src/main/java/net/sourceforge/guacamole/net/auth/ldap/LDAPAuthenticationProvider.java +++ b/extensions/guacamole-auth-ldap/src/main/java/net/sourceforge/guacamole/net/auth/ldap/LDAPAuthenticationProvider.java @@ -59,7 +59,7 @@ import org.slf4j.LoggerFactory; * Allows users to be authenticated against an LDAP server. Each user may have * any number of authorized configurations. Authorized configurations may be * shared. - * + * * @author Michael Jumper */ public class LDAPAuthenticationProvider extends SimpleAuthenticationProvider { @@ -174,16 +174,16 @@ public class LDAPAuthenticationProvider extends SimpleAuthenticationProvider { ); // Construct user DN - String user_dn = + String user_dn = escapeDN(username_attribute) + "=" + escapeDN(credentials.getUsername()) + "," + user_base_dn; - // Bind as user + // Bind as user try { ldapConnection.bind( LDAPConnection.LDAP_V3, user_dn, - credentials.getPassword().getBytes("UTF-8") + credentials.getPassword().getBytes("UTF-8") ); } catch (UnsupportedEncodingException e) { @@ -213,7 +213,7 @@ public class LDAPAuthenticationProvider extends SimpleAuthenticationProvider { // New empty configuration GuacamoleConfiguration config = new GuacamoleConfiguration(); - // Get CN + // Get CN LDAPAttribute cn = entry.getAttribute("cn"); if (cn == null) throw new GuacamoleException("guacConfigGroup without cn"); diff --git a/extensions/guacamole-auth-ldap/src/main/java/net/sourceforge/guacamole/net/auth/ldap/properties/LDAPGuacamoleProperties.java b/extensions/guacamole-auth-ldap/src/main/java/net/sourceforge/guacamole/net/auth/ldap/properties/LDAPGuacamoleProperties.java index 206492a1f..1b7c88d84 100644 --- a/extensions/guacamole-auth-ldap/src/main/java/net/sourceforge/guacamole/net/auth/ldap/properties/LDAPGuacamoleProperties.java +++ b/extensions/guacamole-auth-ldap/src/main/java/net/sourceforge/guacamole/net/auth/ldap/properties/LDAPGuacamoleProperties.java @@ -44,7 +44,7 @@ import net.sourceforge.guacamole.properties.StringGuacamoleProperty; * Provides properties required for use of the LDAP authentication provider. * These properties will be read from guacamole.properties when the LDAP * authentication provider is used. - * + * * @author Michael Jumper */ public class LDAPGuacamoleProperties {