Author: tmckay Date: 2011-11-03 13:21:58 +0000 (Thu, 03 Nov 2011) New Revision: 5107

Modified: branches/lucidity/sesame/cpp/etc/sesame.conf branches/lucidity/sesame/cpp/src/SysAgent.cpp Log: Merge from trunk svn merge -c 5101 svn+ssh://svn.fedorahosted.org/svn/cumin/trunk/sesame . BZ750315

Modified: branches/lucidity/sesame/cpp/etc/sesame.conf =================================================================== --- branches/lucidity/sesame/cpp/etc/sesame.conf 2011-11-03 13:04:05 UTC (rev 5106) +++ branches/lucidity/sesame/cpp/etc/sesame.conf 2011-11-03 13:21:58 UTC (rev 5107) @@ -30,14 +30,14 @@ ##======================

## -## Set the SASL mechanism (PLAIN by default), and the username and password +## Set the SASL mechanism (ANONYMOUS by default), and the username and password ## to be used when authenticating to the broker. If you wish to not store ## the password in this configuration file, you may use pwd-file to point ## to an access-restricted file containing the password. ## -#mech=PLAIN -#uid=guest -#pwd=guest +#mech=ANONYMOUS +#uid= +#pwd= #pwd-file=/etc/sesame/password

##==============

Modified: branches/lucidity/sesame/cpp/src/SysAgent.cpp =================================================================== --- branches/lucidity/sesame/cpp/src/SysAgent.cpp 2011-11-03 13:04:05 UTC (rev 5106) +++ branches/lucidity/sesame/cpp/src/SysAgent.cpp 2011-11-03 13:21:58 UTC (rev 5107) @@ -325,9 +325,9 @@ options["host"] = Option("ADDR", "localhost", "Broker host name or IP address"); options["port"] = Option("N", "5672", "Port for broker service"); options["proto"] = Option("NAME", "tcp", "Protocol for broker communication"); - options["mech"] = Option("NAME", "", "Authentication mechanism"); - options["uid"] = Option("NAME", "guest", "Authentication user name"); - options["pwd"] = Option("PASSWORD", "guest", "Authentication password"); + options["mech"] = Option("NAME", "ANONYMOUS", "Authentication mechanism"); + options["uid"] = Option("NAME", "", "Authentication user name"); + options["pwd"] = Option("PASSWORD", "", "Authentication password"); options["pwd-file"] = Option("FILE", "", "File containing password"); options["service"] = Option("NAME", "qpidd", "SASL service name"); options["min-ssf"] = Option("N", "0", "Minimum acceptable strength for SASL security layer");