sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-27 03:21:53 +03:00
Code

Merge from 2.2 to allow net rpc join -U to complete even if the workstation

Browse Source 
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 used to be commit 3789c8c707)
This commit is contained in:
Tim Potter 2001-12-14 02:17:18 +00:00
parent 9f3b884d3f
commit c5564c55fc
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
source3/utils/net_rpc_join.c
View File

@ -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];