diff options
author | Jim McDonough <jmcd@samba.org> | 2004-01-15 19:45:36 +0000 |
---|---|---|
committer | Jim McDonough <jmcd@samba.org> | 2004-01-15 19:45:36 +0000 |
commit | 8083486dee6b487647745accd810f7514bbb7f0e (patch) | |
tree | bc4b2ee65684e192b3dc8edc59f24edb0f162910 /source3/utils | |
parent | b20f1a95a90033f711a26fdeeb49eaf3059ad91d (diff) | |
download | samba-8083486dee6b487647745accd810f7514bbb7f0e.tar.gz samba-8083486dee6b487647745accd810f7514bbb7f0e.tar.xz samba-8083486dee6b487647745accd810f7514bbb7f0e.zip |
Fix net rpc join (at least newstyle) after it was broken by changing
the parms to cli_lsa_query_info_policy without changing them here...
(This used to be commit a885df7635a9230bc6cca88e7e8fb1420c74c7fb)
Diffstat (limited to 'source3/utils')
-rw-r--r-- | source3/utils/net_rpc_join.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/source3/utils/net_rpc_join.c b/source3/utils/net_rpc_join.c index 96943468ad2..eb91a7df612 100644 --- a/source3/utils/net_rpc_join.c +++ b/source3/utils/net_rpc_join.c @@ -109,7 +109,7 @@ int net_rpc_join_newstyle(int argc, const char **argv) /* rpc variables */ POLICY_HND lsa_pol, sam_pol, domain_pol, user_pol; - DOM_SID domain_sid; + DOM_SID *domain_sid; uint32 user_rid; /* Password stuff */ @@ -127,7 +127,7 @@ int net_rpc_join_newstyle(int argc, const char **argv) NTSTATUS result; int retval = 1; - fstring domain; + char *domain; uint32 num_rids, *name_types, *user_rids; uint32 flags = 0x3e8; char *acct_name; @@ -178,7 +178,7 @@ int net_rpc_join_newstyle(int argc, const char **argv) "error opening lsa policy handle"); CHECK_RPC_ERR(cli_lsa_query_info_policy(cli, mem_ctx, &lsa_pol, - 5, domain, &domain_sid), + 5, &domain, &domain_sid), "error querying info policy"); cli_lsa_close(cli, mem_ctx, &lsa_pol); @@ -199,7 +199,7 @@ int net_rpc_join_newstyle(int argc, const char **argv) CHECK_RPC_ERR(cli_samr_open_domain(cli, mem_ctx, &sam_pol, SEC_RIGHTS_MAXIMUM_ALLOWED, - &domain_sid, &domain_pol), + domain_sid, &domain_pol), "could not open domain"); /* Create domain user */ @@ -339,7 +339,7 @@ int net_rpc_join_newstyle(int argc, const char **argv) strupper_m(domain); - if (!secrets_store_domain_sid(domain, &domain_sid)) { + if (!secrets_store_domain_sid(domain, domain_sid)) { DEBUG(0, ("error storing domain sid for %s\n", domain)); goto done; } |