summaryrefslogtreecommitdiffstats
path: root/source/utils/net_rpc_join.c
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2002-11-12 23:20:50 +0000
committerJeremy Allison <jra@samba.org>2002-11-12 23:20:50 +0000
commitf755711df8f74f9b8e8c1a2b0d07d02a931eeb89 (patch)
treec45545bb30ca33c746b86707475508601d91a3da /source/utils/net_rpc_join.c
parentea4d122a8591288221e6f92a4182de82ab0b51e7 (diff)
downloadsamba-f755711df8f74f9b8e8c1a2b0d07d02a931eeb89.tar.gz
samba-f755711df8f74f9b8e8c1a2b0d07d02a931eeb89.tar.xz
samba-f755711df8f74f9b8e8c1a2b0d07d02a931eeb89.zip
Removed global_myworkgroup, global_myname, global_myscope. Added liberal
dashes of const. This is a rather large check-in, some things may break. It does compile though :-). Jeremy.
Diffstat (limited to 'source/utils/net_rpc_join.c')
-rw-r--r--source/utils/net_rpc_join.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/source/utils/net_rpc_join.c b/source/utils/net_rpc_join.c
index c209886ef17..4b78b7d283d 100644
--- a/source/utils/net_rpc_join.c
+++ b/source/utils/net_rpc_join.c
@@ -104,8 +104,6 @@ done:
int net_rpc_join_newstyle(int argc, const char **argv)
{
- extern pstring global_myname;
-
/* libsmb variables */
struct cli_state *cli;
@@ -187,7 +185,7 @@ int net_rpc_join_newstyle(int argc, const char **argv)
"could not open domain");
/* Create domain user */
- acct_name = talloc_asprintf(mem_ctx, "%s$", global_myname);
+ acct_name = talloc_asprintf(mem_ctx, "%s$", global_myname());
strlower(acct_name);
const_acct_name = acct_name;
@@ -347,9 +345,7 @@ done:
**/
int net_rpc_testjoin(int argc, const char **argv)
{
- char *domain = lp_workgroup();
-
- domain = smb_xstrdup(domain);
+ char *domain = smb_xstrdup(lp_workgroup());
/* Display success or failure */
if (net_rpc_join_ok(domain) != 0) {