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

[gsim]

Author: gsim
Date: Tue Oct 21 15:59:47 2008
New Revision: 706806

URL: http://svn.apache.org/viewvc?rev=706806&view=rev
Log:
Qualify userid with realm when authentication is turned off


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=706806&r1=706805&r2=706806&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/broker/SaslAuthenticator.cpp 
(original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/broker/SaslAuthenticator.cpp Tue Oct 
21 15:59:47 2008
@@ -26,12 +26,15 @@
 #include "Connection.h"
 #include "qpid/log/Statement.h"
 #include "qpid/framing/reply_exceptions.h"
+#include <boost/format.hpp>
 
 #if HAVE_SASL
 #include <sasl/sasl.h>
 #endif
 
 using namespace qpid::framing;
+using boost::format;
+using boost::str;
 
 namespace qpid {
 namespace broker {
@@ -41,6 +44,7 @@
 {
     Connection& connection;
     framing::AMQP_ClientProxy::Connection client;
+    std::string realm;
 public:
     NullAuthenticator(Connection& connection);
     ~NullAuthenticator();
@@ -119,7 +123,8 @@
     }
 }
 
-NullAuthenticator::NullAuthenticator(Connection& c) : connection(c), 
client(c.getOutput()) {}
+NullAuthenticator::NullAuthenticator(Connection& c) : connection(c), 
client(c.getOutput()), 
+                                                      
realm(c.getBroker().getOptions().realm) {}
 NullAuthenticator::~NullAuthenticator() {}
 
 void NullAuthenticator::getMechanisms(Array& mechanisms)
@@ -136,7 +141,7 @@
             string::size_type i = temp.find((char)0);
             string uid = temp.substr(0, i);
             string pwd = temp.substr(i + 1);
-            connection.setUserId(uid);
+            connection.setUserId(str(format("[EMAIL PROTECTED]") % uid % 
realm));
         }
     } else {
         connection.setUserId("anonymous");