Changeset 599 for trunk/server/nsswitch/libwbclient

Timestamp:

Jul 6, 2011, 8:21:13 PM (14 years ago)

Author:

Herwig Bauernfeind

Message:

Samba 3.5: Update trunk to 3.5.9

File:

• trunk/server/nsswitch/libwbclient/wbc_pam.c (modified) (1 diff)

trunk/server/nsswitch/libwbclient/wbc_pam.c

@@ -866 +866 @@
 
                 if (params->new_password.response.nt_data) {
+                        request.data.chng_pswd_auth_crap.new_nt_pswd_len =
+                                params->new_password.response.nt_length;
                         memcpy(request.data.chng_pswd_auth_crap.new_nt_pswd,
                                params->new_password.response.nt_data,
                                request.data.chng_pswd_auth_crap.new_nt_pswd_len);
-                        request.data.chng_pswd_auth_crap.new_nt_pswd_len =
-                                params->new_password.response.nt_length;
                 }
 
                 if (params->new_password.response.lm_data) {
+                        request.data.chng_pswd_auth_crap.new_lm_pswd_len =
+                                params->new_password.response.lm_length;
                         memcpy(request.data.chng_pswd_auth_crap.new_lm_pswd,
                                params->new_password.response.lm_data,
                                request.data.chng_pswd_auth_crap.new_lm_pswd_len);
-                        request.data.chng_pswd_auth_crap.new_lm_pswd_len =
-                                params->new_password.response.lm_length;
                 }
 
                 if (params->old_password.response.old_nt_hash_enc_data) {
+                        request.data.chng_pswd_auth_crap.old_nt_hash_enc_len =
+                                params->old_password.response.old_nt_hash_enc_length;
                         memcpy(request.data.chng_pswd_auth_crap.old_nt_hash_enc,
                                params->old_password.response.old_nt_hash_enc_data,
                                request.data.chng_pswd_auth_crap.old_nt_hash_enc_len);
-                        request.data.chng_pswd_auth_crap.old_nt_hash_enc_len =
-                                params->old_password.response.old_nt_hash_enc_length;
                 }
 
                 if (params->old_password.response.old_lm_hash_enc_data) {
+                        request.data.chng_pswd_auth_crap.old_lm_hash_enc_len =
+                                params->old_password.response.old_lm_hash_enc_length;
                         memcpy(request.data.chng_pswd_auth_crap.old_lm_hash_enc,
                                params->old_password.response.old_lm_hash_enc_data,
                                request.data.chng_pswd_auth_crap.old_lm_hash_enc_len);
-                        request.data.chng_pswd_auth_crap.old_lm_hash_enc_len =
-                                params->old_password.response.old_lm_hash_enc_length;
                 }