Changeset 342 for branches/samba-3.3.x/source/nsswitch/libwbclient

Timestamp:

Oct 30, 2009, 9:39:05 AM (16 years ago)

Author:

Herwig Bauernfeind

Message:

Update 3.3 to 3.3.9

Location:

branches/samba-3.3.x/source/nsswitch/libwbclient

Files:

• wbc_pam.c (modified) (3 diffs)
• wbc_sid.c (modified) (1 diff)
• wbc_util.c (modified) (1 diff)

branches/samba-3.3.x/source/nsswitch/libwbclient/wbc_pam.c

@@ -440 +440 @@
                                 MIN(params->password.response.lm_length,
                                     sizeof(request.data.auth_crap.lm_resp));
-                request.data.auth_crap.nt_resp_len =
-                                MIN(params->password.response.nt_length,
-                                    sizeof(request.data.auth_crap.nt_resp));
                 if (params->password.response.lm_data) {
                         memcpy(request.data.auth_crap.lm_resp,
@@ -448 +445 @@
                                request.data.auth_crap.lm_resp_len);
                 }
-                if (params->password.response.nt_data) {
+                request.data.auth_crap.nt_resp_len = params->password.response.nt_length;
+                if (params->password.response.nt_length > sizeof(request.data.auth_crap.nt_resp)) {
+                        request.flags |= WBFLAG_BIG_NTLMV2_BLOB;
+                        request.extra_len = params->password.response.nt_length;
+                        request.extra_data.data = talloc_zero_array(NULL, char, request.extra_len);
+                        if (request.extra_data.data == NULL) {
+                                wbc_status = WBC_ERR_NO_MEMORY;
+                                BAIL_ON_WBC_ERROR(wbc_status);
+                        }
+                        memcpy(request.extra_data.data,
+                               params->password.response.nt_data,
+                               request.data.auth_crap.nt_resp_len);
+                } else if (params->password.response.nt_data) {
                         memcpy(request.data.auth_crap.nt_resp,
                                params->password.response.nt_data,
@@ -493 +502 @@
         if (response.extra_data.data)
                 free(response.extra_data.data);
+
+        talloc_free(request.extra_data.data);
 
         return wbc_status;

branches/samba-3.3.x/source/nsswitch/libwbclient/wbc_sid.c

@@ -282 +282 @@
                 if (pdomain != NULL) {
                         *pdomain = domain;
+                } else {
+                        talloc_free(domain);
                 }
                 if (pname != NULL) {
                         *pname = name;
+                } else {
+                        talloc_free(name);
                 }
                 if (pname_type != NULL) {

branches/samba-3.3.x/source/nsswitch/libwbclient/wbc_util.c

@@ -285 +285 @@
                 BAIL_ON_WBC_ERROR(wbc_status);
         }
+
+        ZERO_STRUCTP(info);
 
         r = info_string;