r21831: Back out r21823 for a while, this is going into a bzr tree first.

Volker
(This used to be commit fd0ee6722ddfcb64b5cc9c699375524ae3d8709b)

3 files changed, 3 insertions, 8 deletions

diff --git a/source3/utils/net.c b/source3/utils/net.c
index acd7bfb797..5a9b7d31ec 100644
--- a/source3/utils/net.c
+++ b/source3/utils/net.c
@@ -555,9 +555,7 @@ static int net_changesecretpw(int argc, const char **argv)
 
 		trust_pw = get_pass("Enter machine password: ", opt_stdin);
 
-		if (!secrets_store_machine_password(trust_pw, global_myname(),
-						    lp_workgroup(),
-						    sec_channel_type)) {
+		if (!secrets_store_machine_password(trust_pw, lp_workgroup(), sec_channel_type)) {
 			    d_fprintf(stderr, "Unable to write the machine account password in the secrets database");
 			    return 1;
 		}
diff --git a/source3/utils/net_domain.c b/source3/utils/net_domain.c
index 186cb9e8c0..4f7bc8ddec 100644
--- a/source3/utils/net_domain.c
+++ b/source3/utils/net_domain.c
@@ -146,8 +146,7 @@ int netdom_store_machine_account( const char *domain, DOM_SID *sid, const char *
 		return -1;
 	}
 
-	if (!secrets_store_machine_password(pw, global_myname(), domain,
-					    SEC_CHAN_WKSTA)) {
+	if (!secrets_store_machine_password(pw, domain, SEC_CHAN_WKSTA)) {
 		DEBUG(1,("Failed to save machine password\n"));
 		return -1;
 	}
diff --git a/source3/utils/net_rpc_join.c b/source3/utils/net_rpc_join.c
index 01973d2635..ba3c619012 100644
--- a/source3/utils/net_rpc_join.c
+++ b/source3/utils/net_rpc_join.c
@@ -400,9 +400,7 @@ int net_rpc_join_newstyle(int argc, const char **argv)
 		goto done;
 	}
 
-	if (!secrets_store_machine_password(clear_trust_password,
-					    global_myname(), domain,
-					    sec_channel_type)) {
+	if (!secrets_store_machine_password(clear_trust_password, domain, sec_channel_type)) {
 		DEBUG(0, ("error storing plaintext domain secrets for %s\n", domain));
 	}