[SCM] Samba Shared Repository - branch v3-5-test updated

[Karolin Seeger]

The branch, v3-5-test has been updated
       via  fae43d2 Fix bug 8088 - rpccli_samr_chng_pswd_auth_crap segfaults if 
any input blobs are null.
      from  66de22f Fix bug 6966 - "allow trusted domains = no" not respected 
in winbind.

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-5-test


- Log -----------------------------------------------------------------
commit fae43d2640459fe8cb3d485eacd1624de59b9622
Author: Jeremy Allison <j...@samba.org>
Date:   Mon Apr 18 14:26:09 2011 -0700

    Fix bug 8088 - rpccli_samr_chng_pswd_auth_crap segfaults if any input blobs 
are null.

-----------------------------------------------------------------------

Summary of changes:
 source3/rpc_client/cli_samr.c |   21 +++++++++++++++++----
 1 files changed, 17 insertions(+), 4 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/rpc_client/cli_samr.c b/source3/rpc_client/cli_samr.c
index ca7a6b4..936f3bb 100644
--- a/source3/rpc_client/cli_samr.c
+++ b/source3/rpc_client/cli_samr.c
@@ -158,15 +158,28 @@ NTSTATUS rpccli_samr_chng_pswd_auth_crap(struct 
rpc_pipe_client *cli,
        struct samr_Password old_lm_hash_enc;
        struct lsa_String server, account;
 
+       ZERO_STRUCT(new_nt_password);
+       ZERO_STRUCT(new_lm_password);
+       ZERO_STRUCT(old_nt_hash_enc);
+       ZERO_STRUCT(old_lm_hash_enc);
+
        DEBUG(10,("rpccli_samr_chng_pswd_auth_crap\n"));
 
        init_lsa_String(&server, cli->srv_name_slash);
        init_lsa_String(&account, username);
 
-       memcpy(&new_nt_password.data, new_nt_password_blob.data, 516);
-       memcpy(&new_lm_password.data, new_lm_password_blob.data, 516);
-       memcpy(&old_nt_hash_enc.hash, old_nt_hash_enc_blob.data, 16);
-       memcpy(&old_lm_hash_enc.hash, old_lm_hash_enc_blob.data, 16);
+       if (new_nt_password_blob.data && new_nt_password_blob.length >= 516) {
+               memcpy(&new_nt_password.data, new_nt_password_blob.data, 516);
+       }
+       if (new_lm_password_blob.data && new_lm_password_blob.length >= 516) {
+               memcpy(&new_lm_password.data, new_lm_password_blob.data, 516);
+       }
+       if (old_nt_hash_enc_blob.data && old_nt_hash_enc_blob.length >= 16) {
+               memcpy(&old_nt_hash_enc.hash, old_nt_hash_enc_blob.data, 16);
+       }
+       if (old_lm_hash_enc_blob.data && old_lm_hash_enc_blob.length >= 16) {
+               memcpy(&old_lm_hash_enc.hash, old_lm_hash_enc_blob.data, 16);
+       }
 
        result = rpccli_samr_ChangePasswordUser2(cli, mem_ctx,
                                                 &server,


-- 
Samba Shared Repository