From: Günther Deschner <gd@samba.org>
Date: Fri, 11 Jan 2008 13:42:48 +0000 (+0100)
Subject: Remove some more references to global_myname() in libnet_join.
X-Git-Tag: samba-3.2.0pre2~38^2~11
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ed4960baccf687b77c2b0f4ee64cbce2005f3abb;p=thirdparty%2Fsamba.git

Remove some more references to global_myname() in libnet_join.

Guenther
---

diff --git a/source/libnet/libnet_join.c b/source/libnet/libnet_join.c
index 3bc1464f18c..4fec5ac294a 100644
--- a/source/libnet/libnet_join.c
+++ b/source/libnet/libnet_join.c
@@ -611,7 +611,7 @@ static NTSTATUS libnet_join_joindomain_rpc(TALLOC_CTX *mem_ctx,
 		goto done;
 	}
 
-	acct_name = talloc_asprintf(mem_ctx, "%s$", global_myname());
+	acct_name = talloc_asprintf(mem_ctx, "%s$", r->in.machine_name);
 	strlower_m(acct_name);
 	const_acct_name = acct_name;
 
@@ -773,7 +773,7 @@ static NTSTATUS libnet_join_unjoindomain_rpc(TALLOC_CTX *mem_ctx,
 		goto done;
 	}
 
-	acct_name = talloc_asprintf(mem_ctx, "%s$", global_myname());
+	acct_name = talloc_asprintf(mem_ctx, "%s$", r->in.machine_name);
 	strlower_m(acct_name);
 	const_acct_name = acct_name;