From 3a548a4564932e8db42834b332be1574d1de1483 Mon Sep 17 00:00:00 2001 From: Gary Spencer Date: Tue, 9 Sep 2008 18:22:58 +0000 Subject: [PATCH] Changes to transaction handling due to recent merge git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@10872 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../filesys/auth/cifs/AlfrescoCifsAuthenticator.java | 4 ++-- .../filesys/auth/cifs/EnterpriseCifsAuthenticator.java | 8 +++++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/source/java/org/alfresco/filesys/auth/cifs/AlfrescoCifsAuthenticator.java b/source/java/org/alfresco/filesys/auth/cifs/AlfrescoCifsAuthenticator.java index 432d94a919..72cc2a09ca 100644 --- a/source/java/org/alfresco/filesys/auth/cifs/AlfrescoCifsAuthenticator.java +++ b/source/java/org/alfresco/filesys/auth/cifs/AlfrescoCifsAuthenticator.java @@ -166,7 +166,7 @@ public class AlfrescoCifsAuthenticator extends CifsAuthenticatorBase { // Start a transaction - tx = getTransactionService().getUserTransaction( true); + tx = getTransactionService().getUserTransaction( false); tx.begin(); // Perform local MD4 password check @@ -177,7 +177,7 @@ public class AlfrescoCifsAuthenticator extends CifsAuthenticatorBase { // Start a transaction - tx = getTransactionService().getUserTransaction( true); + tx = getTransactionService().getUserTransaction( false); tx.begin(); // Perform passthru authentication password check diff --git a/source/java/org/alfresco/filesys/auth/cifs/EnterpriseCifsAuthenticator.java b/source/java/org/alfresco/filesys/auth/cifs/EnterpriseCifsAuthenticator.java index 63d980543b..271434abf0 100644 --- a/source/java/org/alfresco/filesys/auth/cifs/EnterpriseCifsAuthenticator.java +++ b/source/java/org/alfresco/filesys/auth/cifs/EnterpriseCifsAuthenticator.java @@ -290,8 +290,10 @@ public class EnterpriseCifsAuthenticator extends CifsAuthenticatorBase implement String mecListMIC = null; StringBuilder mic = new StringBuilder(); + + mic.append("cifs/"); mic.append( config.getServerName().toLowerCase()); - mic.append("$@"); + mic.append("@"); mic.append( m_krbRealm); mecListMIC = mic.toString(); @@ -559,7 +561,7 @@ public class EnterpriseCifsAuthenticator extends CifsAuthenticatorBase implement { // Start a transaction - tx = getTransactionService().getUserTransaction( true); + tx = getTransactionService().getUserTransaction( false); tx.begin(); // Process the hashed password session setup @@ -716,7 +718,7 @@ public class EnterpriseCifsAuthenticator extends CifsAuthenticatorBase implement // Start a transaction - tx = getTransactionService().getUserTransaction( true); + tx = getTransactionService().getUserTransaction( false); tx.begin(); // Process the security blob