Changeset 920 for trunk/server/source3/libads/sasl.c

Timestamp:

Jun 9, 2016, 2:23:12 PM (9 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: apply latest security patches to trunk

Location:

trunk/server

Files:

• . (modified) (1 prop)
• source3/libads/sasl.c (modified) (1 diff)

trunk/server/source3/libads/sasl.c

@@ -261 +261 @@
         /* we have a reference conter on ntlmssp_state, if we are signing
            then the state will be kept by the signing engine */
+
+        if (ads->ldap.wrap_type >= ADS_SASLWRAP_TYPE_SEAL) {
+                bool ok;
+
+                ok = ntlmssp_have_feature(ntlmssp_state,
+                                          NTLMSSP_FEATURE_SEAL);
+                if (!ok) {
+                        DEBUG(0,("The ntlmssp feature sealing request, but unavailable\n"));
+                        TALLOC_FREE(ntlmssp_state);
+                        return ADS_ERROR_NT(NT_STATUS_INVALID_NETWORK_RESPONSE);
+                }
+
+                ok = ntlmssp_have_feature(ntlmssp_state,
+                                          NTLMSSP_FEATURE_SIGN);
+                if (!ok) {
+                        DEBUG(0,("The ntlmssp feature signing request, but unavailable\n"));
+                        TALLOC_FREE(ntlmssp_state);
+                        return ADS_ERROR_NT(NT_STATUS_INVALID_NETWORK_RESPONSE);
+                }
+
+        } else if (ads->ldap.wrap_type >= ADS_SASLWRAP_TYPE_SIGN) {
+                bool ok;
+
+                ok = ntlmssp_have_feature(ntlmssp_state,
+                                          NTLMSSP_FEATURE_SIGN);
+                if (!ok) {
+                        DEBUG(0,("The gensec feature signing request, but unavailable\n"));
+                        TALLOC_FREE(ntlmssp_state);
+                        return ADS_ERROR_NT(NT_STATUS_INVALID_NETWORK_RESPONSE);
+                }
+        }
 
         if (ads->ldap.wrap_type > ADS_SASLWRAP_TYPE_PLAIN) {