diff options
| author | Tim Potter <tpot@samba.org> | 2003-09-10 06:49:13 +0000 |
|---|---|---|
| committer | Tim Potter <tpot@samba.org> | 2003-09-10 06:49:13 +0000 |
| commit | 51297321ba50e47d30179cf17713e1d205a33d22 (patch) | |
| tree | ca62c37ae2eb57d612bb676c42d4d07b3ff754e7 | |
| parent | ab87cee6cbaee1eb6bc9f292572c3ea26cb21e07 (diff) | |
| download | samba-51297321ba50e47d30179cf17713e1d205a33d22.tar.gz samba-51297321ba50e47d30179cf17713e1d205a33d22.tar.bz2 samba-51297321ba50e47d30179cf17713e1d205a33d22.zip | |
Use opt_target_workgroup instead of lp_workgroup() in vampire code so
we can override the value in smb.conf with the -w option.
Migrating accounts from another domain can now be done like:
# bin/net join bdc -w nt4dom -Uadministrator%password
# bin/net rpc vampire -w nt4dom -U administrator%password
(This used to be commit d7bd3c1efbd02a7ca01ad9a4b242ea4cc4a63c1f)
| -rw-r--r-- | source3/utils/net_rpc_samsync.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source3/utils/net_rpc_samsync.c b/source3/utils/net_rpc_samsync.c index ed69f8a326..4d8fa5e7e2 100644 --- a/source3/utils/net_rpc_samsync.c +++ b/source3/utils/net_rpc_samsync.c @@ -1034,7 +1034,7 @@ int rpc_vampire(int argc, const char **argv) goto fail; } - if (!secrets_fetch_trust_account_password(lp_workgroup(), + if (!secrets_fetch_trust_account_password(opt_target_workgroup, trust_password, NULL, &sec_channel)) { d_printf("Could not retrieve domain trust secret\n"); @@ -1056,7 +1056,7 @@ int rpc_vampire(int argc, const char **argv) nt_errstr(result)); if (NT_STATUS_EQUAL(result, NT_STATUS_NOT_SUPPORTED)) d_printf("Perhaps %s is a Windows 2000 native mode " - "domain?\n", lp_workgroup()); + "domain?\n", opt_target_workgroup); goto fail; } |