diff options
| author | Jim McDonough <jmcd@samba.org> | 2004-01-15 19:49:57 +0000 |
|---|---|---|
| committer | Jim McDonough <jmcd@samba.org> | 2004-01-15 19:49:57 +0000 |
| commit | e367f403851ba3bdb1912fb6c89c478241c016d4 (patch) | |
| tree | 948163307269d0e01b4dd1ac856a5438fee54363 | |
| parent | 341699b0053c18bfaf5b8c1aec63e3e16f965876 (diff) | |
| download | samba-e367f403851ba3bdb1912fb6c89c478241c016d4.tar.gz samba-e367f403851ba3bdb1912fb6c89c478241c016d4.tar.bz2 samba-e367f403851ba3bdb1912fb6c89c478241c016d4.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 97d6f4752572cc10894e6e80379c25f5da143ad1)
| -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 96943468ad..eb91a7df61 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; } |