svn commit: r1027594 - in /qpid/trunk/qpid/cpp/src: qpid/broker/Broker.cpp tests/sasl_fed

[mg...@apache.org]

Author: mgoulish
Date: Tue Oct 26 15:25:40 2010
New Revision: 1027594

URL: http://svn.apache.org/viewvc?rev=1027594&view=rev
Log:
This code's purpose was only to print out the sasl version into the logs
so that I could grep for it in the sasl_fed test.  But it is breaking the
windows build.   So I am backing it out, and temporarily disabling the 
sasl_fed test until I can implement something a little less grotesque.


Modified:
    qpid/trunk/qpid/cpp/src/qpid/broker/Broker.cpp
    qpid/trunk/qpid/cpp/src/tests/sasl_fed

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=1027594&r1=1027593&r2=1027594&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/Broker.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/Broker.cpp Tue Oct 26 15:25:40 2010
@@ -55,8 +55,6 @@
 #include "qpid/Url.h"
 #include "qpid/Version.h"
 
-#include "sasl/sasl.h"
-
 #include <boost/bind.hpp>
 #include <boost/format.hpp>
 
@@ -273,9 +271,7 @@ Broker::Broker(const Broker::Options& co
      */
     if (conf.auth) {
         SaslAuthenticator::init(qpid::saslName, conf.saslConfigPath);
-        int saslVersion = (SASL_VERSION_MAJOR << 16) + (SASL_VERSION_MINOR << 8) +
-        SASL_VERSION_STEP;
-        QPID_LOG(info, "SASL enabled : version " << saslVersion);
+        QPID_LOG(info, "SASL enabled");
     } else {
         QPID_LOG(notice, "SASL disabled: No Authentication Performed");
     }

Modified: qpid/trunk/qpid/cpp/src/tests/sasl_fed
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/sasl_fed?rev=1027594&r1=1027593&r2=1027594&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/tests/sasl_fed (original)
+++ qpid/trunk/qpid/cpp/src/tests/sasl_fed Tue Oct 26 15:25:40 2010
@@ -1,5 +1,27 @@
 #! /bin/bash
 
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+# 
+#   http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+# disable this test for all sasl verisons temporarily until TODO, below, is completed.
+exit 0
+
 source test_env.sh
 
 sasl_config_file=$builddir/sasl_config
@@ -44,15 +66,7 @@ broker_2_port=`cat $tmp_root/broker_2_po
 
 sleep 2
 
-# Grep the sasl version out of broker 2's log
-sasl_version=`cat $tmp_root/qpidd_2.log | grep "SASL enabled" | tr ' ' '\n' | tail -1`
-
-# Minimum sasl version I can use is 2.1.22 == (2<<16) + (1<<8) + 22 == 131350.
-if [ "$sasl_version" -lt "131350" ]; then
-  echo "sasl_fed test requires SASL version 2.1.22 or greater"
-  # but this should not cause a test failure.
-  exit 0
-fi
+# TODO -- check for SASL version here, and exit 0 if it is less than 2.1.22 == 131350.
 
 
 # I am not randomizing these names, because the test creates its own brokers.



---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project:      http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org