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.


git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1477724 13f79535-47bb-0310-9956-ffa450edef68

4 files changed, 2 insertions, 5 deletions

diff --git a/cpp/BuildInstallSettings.cmake b/cpp/BuildInstallSettings.cmake
index ea9b83c62b..d63a61e512 100644
--- a/cpp/BuildInstallSettings.cmake
+++ b/cpp/BuildInstallSettings.cmake
@@ -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
diff --git a/cpp/src/Makefile.am b/cpp/src/Makefile.am
index 0f743a5a39..9c2ca83214 100644
--- a/cpp/src/Makefile.am
+++ b/cpp/src/Makefile.am
@@ -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\"
diff --git a/cpp/src/config.h.cmake b/cpp/src/config.h.cmake
index 31fafcdea8..5c8c56c749 100644
--- a/cpp/src/config.h.cmake
+++ b/cpp/src/config.h.cmake
@@ -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}
diff --git a/cpp/src/qpid/broker/Broker.cpp b/cpp/src/qpid/broker/Broker.cpp
index 87df6569cb..f8c6ccc3b1 100644
--- a/cpp/src/qpid/broker/Broker.cpp
+++ b/cpp/src/qpid/broker/Broker.cpp
@@ -136,7 +136,6 @@ Broker::Options::Options(const std::string& name) :
     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::string& name) :
         ("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")