Changeset 165 for branches/samba-3.0/source/nsswitch/winbindd_pam.c

Timestamp:

Mar 11, 2009, 9:14:55 AM (16 years ago)

Author:

Paul Smedley

Message:

Add 'missing' 3.0.34 diffs

File:

• branches/samba-3.0/source/nsswitch/winbindd_pam.c (modified) (1 diff)

branches/samba-3.0/source/nsswitch/winbindd_pam.c

@@ -1763 +1763 @@
         if (state->request.data.auth_crap.lm_resp_len > sizeof(state->request.data.auth_crap.lm_resp)
                 || state->request.data.auth_crap.nt_resp_len > sizeof(state->request.data.auth_crap.nt_resp)) {
-                DEBUG(0, ("winbindd_pam_auth_crap: invalid password length %u/%u\n", 
-                          state->request.data.auth_crap.lm_resp_len, 
-                          state->request.data.auth_crap.nt_resp_len));
-                result = NT_STATUS_INVALID_PARAMETER;
-                goto done;
+                if (!state->request.flags & WBFLAG_BIG_NTLMV2_BLOB ||
+                     state->request.extra_len != state->request.data.auth_crap.nt_resp_len) {
+                        DEBUG(0, ("winbindd_pam_auth_crap: invalid password length %u/%u\n",
+                                  state->request.data.auth_crap.lm_resp_len,
+                                  state->request.data.auth_crap.nt_resp_len));
+                                  result = NT_STATUS_INVALID_PARAMETER;
+                        goto done;
+                }
         }
 
         lm_resp = data_blob_talloc(state->mem_ctx, state->request.data.auth_crap.lm_resp,
                                         state->request.data.auth_crap.lm_resp_len);
-        nt_resp = data_blob_talloc(state->mem_ctx, state->request.data.auth_crap.nt_resp,
-                                        state->request.data.auth_crap.nt_resp_len);
+        if (state->request.flags & WBFLAG_BIG_NTLMV2_BLOB) {
+                nt_resp = data_blob_talloc(state->mem_ctx,
+                                           state->request.extra_data.data,
+                                           state->request.data.auth_crap.nt_resp_len);
+        } else {
+                nt_resp = data_blob_talloc(state->mem_ctx,
+                                           state->request.data.auth_crap.nt_resp,
+                                           state->request.data.auth_crap.nt_resp_len);
+        }
 
         /* what domain should we contact? */