inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-07 17:49:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged V3.3-BUG-FIX to HEAD

Browse Source 
21634: Fix ALF-3822: Storing of datetime does not work
   21646: ALF-3752: Getting Parent on a specific version throws exception
   21655: Fix ALF-4006: Incorrect search result after renaming a folder
   21659: Workaround for ALF-4230: use of flash technology to upload documents into a share site makes the use of (some) external authentication methods difficult (or impossible)
      - The Flash uploader can be disabled via share-config: DocumentLibary / file-upload / adobe-flash-enabled
   21675: AVM - build/test fix (testSubmitUpdatedItemWithLF)
   21687: Merged V3.3 to V3.3-BUG-FIX
      21650: Fix for ALF-4239: Cannot open any folder that contains a node that is neither folder nor content in Share repo browser
      21658: Merged HEAD to BRANCHES/V3.3:
         21557: Fix ALF-4141: Cannot create relationship via OpenCMIS
      21673: ALF-1905: Corrected LDAP connection validation to allow synchronization connection to use anonymous bind
      21686: Merged PATCHES/V3.3.1 to V3.3
         21684: ALF-4039: Use ISO 9705-style encoding to ensure that compound WCM store names do not collide when user names contain illegal characters
            - Previously, characters that were illegal were just replaced with _ so there could be collisions in store names
            - Also, the sequence -- in a user name or user names "preview" and "workflow" would have been problematic.
         21535: (RECORD ONLY) Merged V3.3 to PATCHES/V3.3.1
            20778: Added revision to version label.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@21689 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Dave Ward
2010-08-09 15:28:11 +00:00
parent b51e8ef744
commit 420caeac25
6 changed files with 147 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
source/java/org/alfresco/repo/security/authentication/ldap/LDAPInitialDirContextFactoryImpl.java
View File

@@ -372,14 +372,14 @@ public class LDAPInitialDirContextFactoryImpl implements LDAPInitialDirContextFa
// Check more if we have a real principal we expect to work
env = new Hashtable<String, String>(defaultEnvironment.size());
env.putAll(defaultEnvironment);
if (env.get(Context.SECURITY_PRINCIPAL) != null)
String principal = defaultEnvironment.get(Context.SECURITY_PRINCIPAL);
if (principal != null)
{
// Correct principal invalid password
env = new Hashtable<String, String>(defaultEnvironment.size());
env.putAll(defaultEnvironment);
env = new Hashtable<String, String>(authenticatedEnvironment.size());
env.putAll(authenticatedEnvironment);
env.put(Context.SECURITY_PRINCIPAL, principal);
env.put(Context.SECURITY_CREDENTIALS, "sdasdasdasdasd123123123");
try
{