Fix NET_2_1 builds (regression from the previous SecurityBindingElement fixes).

diff --git a/mcs/class/System.ServiceModel/System.ServiceModel/BasicHttpBinding.cs b/mcs/class/System.ServiceModel/System.ServiceModel/BasicHttpBinding.cs
index 614a047572c664f04d330461d43bbbb93b3da4b4..d462b0f7a01b1fe0fb2f9f53b60011c8e649c401 100644 (file)
--- a/mcs/class/System.ServiceModel/System.ServiceModel/BasicHttpBinding.cs
+++ b/mcs/class/System.ServiceModel/System.ServiceModel/BasicHttpBinding.cs
@@ -207,23 +207,25 @@ namespace System.ServiceModel
                                        throw new InvalidOperationException ("When Message security is enabled in a BasicHttpBinding, the message security credential type must be BasicHttpMessageCredentialType.Certificate.");
                                element = SecurityBindingElement.CreateMutualCertificateBindingElement (
                                    MessageSecurityVersion.WSSecurity10WSTrustFebruary2005WSSecureConversationFebruary2005WSSecurityPolicy11BasicSecurityProfile10);
-                break;
+                               break;
 
                        case BasicHttpSecurityMode.TransportWithMessageCredential:
-                if (Security.Message.ClientCredentialType != BasicHttpMessageCredentialType.Certificate)
-                    // FIXME: pass proper security token parameters.
-                    element = SecurityBindingElement.CreateCertificateOverTransportBindingElement ();
-                else
-                    element = new AsymmetricSecurityBindingElement ();
-                break;
+                               if (Security.Message.ClientCredentialType != BasicHttpMessageCredentialType.Certificate)
+                                       // FIXME: pass proper security token parameters.
+                                       element = SecurityBindingElement.CreateCertificateOverTransportBindingElement ();
+                               else
+                                       element = new AsymmetricSecurityBindingElement ();
+                               break;
 #endif
                        default: 
                                return null;
                        }
 
-            element.SetKeyDerivation (false);
-            element.SecurityHeaderLayout = SecurityHeaderLayout.Lax;
-            return element;
+#if !NET_2_1
+                       element.SetKeyDerivation (false);
+                       element.SecurityHeaderLayout = SecurityHeaderLayout.Lax;
+#endif
+                       return element;
                }
 
                MessageEncodingBindingElement BuildMessageEncodingBindingElement ()