Author: mgoulish
Date: Tue Apr 30 17:04:46 2013
New Revision: 1477724
URL: http://svn.apache.org/r1477724
Log:
QPID-4759 : make qpidd --help display sasl config dir default location
Backing out my previous changes and just changing the help comment
for the --sasl-config flag.
Modified:
qpid/trunk/qpid/cpp/BuildInstallSettings.cmake
qpid/trunk/qpid/cpp/src/Makefile.am
qpid/trunk/qpid/cpp/src/config.h.cmake
qpid/trunk/qpid/cpp/src/qpid/broker/Broker.cpp
Modified: qpid/trunk/qpid/cpp/BuildInstallSettings.cmake
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/BuildInstallSettings.cmake?rev=1477724&r1=1477723&r2=1477724&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/BuildInstallSettings.cmake (original)
+++ qpid/trunk/qpid/cpp/BuildInstallSettings.cmake Tue Apr 30 17:04:46 2013
@@ -184,7 +184,6 @@ if (UNIX)
set_absolute_install_path (QPIDC_MODULE_DIR
${QPID_INSTALL_LIBDIR}/qpid/client) # Directory to load client plug-in modules
from
set_absolute_install_path (QPIDD_MODULE_DIR
${QPID_INSTALL_LIBDIR}/qpid/daemon) # Directory to load broker plug-in modules
from
- set_absolute_install_path (QPIDD_SASLCONF_DIR ${QPID_INSTALL_SASLDIR}) #
Directory to put Cyrus SASL config files into
#----
# Set RPATH so that installe executables can run without setting
Modified: qpid/trunk/qpid/cpp/src/Makefile.am
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/Makefile.am?rev=1477724&r1=1477723&r2=1477724&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/Makefile.am (original)
+++ qpid/trunk/qpid/cpp/src/Makefile.am Tue Apr 30 17:04:46 2013
@@ -140,7 +140,7 @@ qpidtest_SCRIPTS =
tmoduleexecdir = $(libdir)/qpid/tests
tmoduleexec_LTLIBRARIES=
-BROKER_CXXFLAGS = -D_IN_QPID_BROKER
-DQPIDD_SASLCONF_DIR=\"$(sysconfdir)/sasl2\"
+BROKER_CXXFLAGS = -D_IN_QPID_BROKER
## Automake macros to build libraries and executables.
qpidd_CXXFLAGS = $(AM_CXXFLAGS) $(BROKER_CXXFLAGS)
-DQPIDD_MODULE_DIR=\"$(dmoduleexecdir)\"
-DQPIDD_CONF_FILE=\"$(sysconfdir)/qpidd.conf\"
-DQPIDC_CONF_FILE=\"$(confdir)/qpidc.conf\"
Modified: qpid/trunk/qpid/cpp/src/config.h.cmake
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/config.h.cmake?rev=1477724&r1=1477723&r2=1477724&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/config.h.cmake (original)
+++ qpid/trunk/qpid/cpp/src/config.h.cmake Tue Apr 30 17:04:46 2013
@@ -53,7 +53,6 @@
#cmakedefine QPID_HAS_CLOCK_GETTIME
#cmakedefine BROKER_SASL_NAME "${BROKER_SASL_NAME}"
-#cmakedefine QPIDD_SASLCONF_DIR "${QPIDD_SASLCONF_DIR}"
#cmakedefine HAVE_SASL ${HAVE_SASL}
#cmakedefine HAVE_OPENAIS_CPG_H ${HAVE_OPENAIS_CPG_H}
Modified: qpid/trunk/qpid/cpp/src/qpid/broker/Broker.cpp
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/Broker.cpp?rev=1477724&r1=1477723&r2=1477724&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/Broker.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/Broker.cpp Tue Apr 30 17:04:46 2013
@@ -136,7 +136,6 @@ Broker::Options::Options(const std::stri
tcpNoDelay(true),
requireEncrypted(false),
knownHosts(knownHostsNone),
- saslConfigPath(QPIDD_SASLCONF_DIR),
qmf2Support(true),
qmf1Support(true),
queueFlowStopRatio(80),
@@ -178,7 +177,7 @@ Broker::Options::Options(const std::stri
("tcp-nodelay", optValue(tcpNoDelay), "Set TCP_NODELAY on TCP
connections")
("require-encryption", optValue(requireEncrypted), "Only accept
connections that are encrypted")
("known-hosts-url", optValue(knownHosts, "URL or 'none'"), "URL to
send as 'known-hosts' to clients ('none' implies empty list)")
- ("sasl-config", optValue(saslConfigPath, "DIR"), "gets sasl config
info from nonstandard location")
+ ("sasl-config", optValue(saslConfigPath, "DIR"), "Allows SASL config
path, if supported by platform, to be overridden. For default location on
Linux, see Cyrus SASL documentation. There is no SASL config dir on Windows.")
("default-flow-stop-threshold", optValue(queueFlowStopRatio,
"PERCENT"), "Percent of queue's maximum capacity at which flow control is
activated.")
("default-flow-resume-threshold", optValue(queueFlowResumeRatio,
"PERCENT"), "Percent of queue's maximum capacity at which flow control is
de-activated.")
("default-event-threshold-ratio", optValue(queueThresholdEventRatio,
"%age of limit"), "The ratio of any specified queue limit at which an event
will be raised")
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
