Correct location of TransportOption feature, makes no sense inside policies.

[shibboleth/sp.git] / shibsp / binding / impl / SOAPClient.cpp

diff --git a/shibsp/binding/impl/SOAPClient.cpp b/shibsp/binding/impl/SOAPClient.cpp
index 63e7405..656a2c8 100644 (file)
--- a/shibsp/binding/impl/SOAPClient.cpp
+++ b/shibsp/binding/impl/SOAPClient.cpp
@@ -159,7 +159,7 @@ void SOAPClient::prepareTransport(SOAPTransport& transport)
             type = SOAPTransport::transport_auth_ntlm;
         else if (!strcmp(authType.second,"gss"))
             type = SOAPTransport::transport_auth_gss;
-        else
+        else if (strcmp(authType.second,"none"))
             log.error("unknown authType (%s) specified for RelyingParty", authType.second);
         if (type > SOAPTransport::transport_auth_none) {
             if (transport.setAuth(type,username.second,password.second))
@@ -173,7 +173,7 @@ void SOAPClient::prepareTransport(SOAPTransport& transport)
     transport.setConnectTimeout(timeout.first ? timeout.second : 10);
     timeout = m_relyingParty->getUnsignedInt("timeout");
     transport.setTimeout(timeout.first ? timeout.second : 20);
-    m_app.getServiceProvider().setTransportOptions(m_app.getString("policyId").second, transport);
+    m_app.getServiceProvider().setTransportOptions(transport);
 
     HTTPSOAPTransport* http = dynamic_cast<HTTPSOAPTransport*>(&transport);
     if (http) {