The branch, master has been updated
via 84de81b4786bed411199f2785a1eafc7c86db478 (commit)
via d696f9a7ed0bb42c6d9de99ab07af27b00fe2d40 (commit)
from ab8a16c77f8222115493bbc295318a7d9ceb6d38 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 84de81b4786bed411199f2785a1eafc7c86db478
Author: Volker Lendecke <v...@samba.org>
Date: Sun Oct 4 15:19:19 2009 +0200
s3: Remove a scary error message -- talloc_move can not fail :-)
Signed-off-by: Günther Deschner <g...@samba.org>
commit d696f9a7ed0bb42c6d9de99ab07af27b00fe2d40
Author: Volker Lendecke <v...@samba.org>
Date: Sun Oct 4 15:13:44 2009 +0200
s3: Fix nonempty blank lines
Signed-off-by: Günther Deschner <g...@samba.org>
-----------------------------------------------------------------------
Summary of changes:
source3/libsmb/trusts_util.c | 8 ++++----
source3/rpc_client/cli_pipe.c | 5 -----
2 files changed, 4 insertions(+), 9 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/libsmb/trusts_util.c b/source3/libsmb/trusts_util.c
index 929816e..adf1525 100644
--- a/source3/libsmb/trusts_util.c
+++ b/source3/libsmb/trusts_util.c
@@ -35,7 +35,7 @@ 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;
NTSTATUS nt_status;
-
+
/* Create a random machine account password */
new_trust_passwd = generate_random_str(mem_ctx,
DEFAULT_TRUST_ACCOUNT_PASSWORD_LENGTH);
@@ -43,7 +43,7 @@ NTSTATUS trust_pw_change_and_store_it(struct rpc_pipe_client
*cli, TALLOC_CTX *m
DEBUG(0, ("talloc_strdup failed\n"));
return NT_STATUS_NO_MEMORY;
}
-
+
E_md4hash(new_trust_passwd, new_trust_passwd_hash);
nt_status = rpccli_netlogon_set_trust_password(cli, mem_ctx,
@@ -51,7 +51,7 @@ NTSTATUS trust_pw_change_and_store_it(struct rpc_pipe_client
*cli, TALLOC_CTX *m
new_trust_passwd,
new_trust_passwd_hash,
sec_channel_type);
-
+
if (NT_STATUS_IS_OK(nt_status)) {
DEBUG(3,("%s : trust_pw_change_and_store_it: Changed
password.\n",
current_timestring(debug_ctx(), False)));
@@ -86,7 +86,7 @@ NTSTATUS trust_pw_find_change_and_store_it(struct
rpc_pipe_client *cli,
DEBUG(0, ("could not fetch domain secrets for domain %s!\n",
domain));
return NT_STATUS_UNSUCCESSFUL;
}
-
+
return trust_pw_change_and_store_it(cli, mem_ctx, domain,
old_trust_passwd_hash,
sec_channel_type);
diff --git a/source3/rpc_client/cli_pipe.c b/source3/rpc_client/cli_pipe.c
index 34b8616..dc4dfbd 100644
--- a/source3/rpc_client/cli_pipe.c
+++ b/source3/rpc_client/cli_pipe.c
@@ -3940,11 +3940,6 @@ NTSTATUS cli_rpc_pipe_open_schannel_with_key(struct
cli_state *cli,
* in - reference them in
*/
result->dc = talloc_move(result, pdc);
- if (result->dc == NULL) {
- DEBUG(0, ("talloc reference failed\n"));
- TALLOC_FREE(result);
- return NT_STATUS_NO_MEMORY;
- }
DEBUG(10,("cli_rpc_pipe_open_schannel_with_key: opened pipe %s to
machine %s "
"for domain %s and bound using schannel.\n",
--
Samba Shared Repository
