svn commit: r707427 - /incubator/qpid/trunk/qpid/cpp/src/qpid/broker/SaslAuthenticator.cpp

[gsim]

Author: gsim
Date: Thu Oct 23 10:50:58 2008
New Revision: 707427

URL: http://svn.apache.org/viewvc?rev=707427&view=rev
Log:
don't append realm in null authenticator if the userid as supplied already ends 
with it


Modified:
    incubator/qpid/trunk/qpid/cpp/src/qpid/broker/SaslAuthenticator.cpp

Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/broker/SaslAuthenticator.cpp
URL: 
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/broker/SaslAuthenticator.cpp?rev=707427&r1=707426&r2=707427&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/broker/SaslAuthenticator.cpp 
(original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/broker/SaslAuthenticator.cpp Thu Oct 
23 10:50:58 2008
@@ -141,7 +141,11 @@
             string::size_type i = temp.find((char)0);
             string uid = temp.substr(0, i);
             string pwd = temp.substr(i + 1);
-            connection.setUserId(str(format("[EMAIL PROTECTED]") % uid % 
realm));
+            i = uid.find_last_of(realm);
+            if (i == string::npos || i != (uid.size() - 1)) {
+                uid = str(format("[EMAIL PROTECTED]") % uid % realm);
+            }
+            connection.setUserId(uid);
         }
     } else {
         connection.setUserId("anonymous");