diff options
author | Jelmer Vernooij <jelmer@samba.org> | 2008-10-19 14:27:08 +0200 |
---|---|---|
committer | Jelmer Vernooij <jelmer@samba.org> | 2008-10-19 14:27:08 +0200 |
commit | e09c0c1185b4a4ad1d28023549074875028f3e55 (patch) | |
tree | 158cd066a2dd19169748a6d94fc990953d49b6c9 /source3/libsmb | |
parent | 33032d591f8e39edae0ce4b35ca1b6e25f04a04b (diff) | |
parent | 085e7b0b6cc882b31c11b6d6ea7834235588e1ed (diff) | |
download | samba-e09c0c1185b4a4ad1d28023549074875028f3e55.tar.gz samba-e09c0c1185b4a4ad1d28023549074875028f3e55.tar.bz2 samba-e09c0c1185b4a4ad1d28023549074875028f3e55.zip |
Merge branch 'master' of ssh://git.samba.org/data/git/samba into crypt
Diffstat (limited to 'source3/libsmb')
-rw-r--r-- | source3/libsmb/trusts_util.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/source3/libsmb/trusts_util.c b/source3/libsmb/trusts_util.c index 2f336f14e6..f0595695d2 100644 --- a/source3/libsmb/trusts_util.c +++ b/source3/libsmb/trusts_util.c @@ -33,13 +33,12 @@ NTSTATUS trust_pw_change_and_store_it(struct rpc_pipe_client *cli, TALLOC_CTX *m { unsigned char new_trust_passwd_hash[16]; char *new_trust_passwd; - char *str; NTSTATUS nt_status; /* Create a random machine account password */ - str = generate_random_str(DEFAULT_TRUST_ACCOUNT_PASSWORD_LENGTH); + new_trust_passwd = generate_random_str(mem_ctx, DEFAULT_TRUST_ACCOUNT_PASSWORD_LENGTH); - if ((new_trust_passwd = talloc_strdup(mem_ctx, str)) == NULL) { + if (new_trust_passwd == NULL) { DEBUG(0, ("talloc_strdup failed\n")); return NT_STATUS_NO_MEMORY; } |