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