mirror of
https://github.com/samba-team/samba.git
synced 2025-03-08 04:58:40 +03:00
Merge from 2.2 to allow net rpc join -U to complete even if the workstation
account already exists. # net rpc join --user=Administrator%password It's kind of weird seeing the mix of NET.EXE style of options (net command subcommand /arg:value) with the GNU-style long options. I think it works.
This commit is contained in:
parent
e135320e05
commit
3789c8c707
@ -138,13 +138,16 @@ int net_rpc_join(int argc, const char **argv)
|
||||
0xe005000b, &user_pol,
|
||||
&user_rid);
|
||||
|
||||
/* We *must* do this.... don't ask... */
|
||||
if (!NT_STATUS_IS_OK(result) &&
|
||||
!NT_STATUS_EQUAL(result, NT_STATUS_USER_EXISTS)) {
|
||||
d_printf("Create of workstation account failed\n");
|
||||
goto done;
|
||||
}
|
||||
cli_samr_close(cli, mem_ctx, &user_pol);
|
||||
|
||||
/* We *must* do this.... don't ask... */
|
||||
|
||||
if (NT_STATUS_IS_OK(result))
|
||||
cli_samr_close(cli, mem_ctx, &user_pol);
|
||||
|
||||
names = (char *)&acct_name[0];
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user