sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-27 14:04:05 +03:00
Code

r16255: Fix 'net ads join' when the workgroup is set incorrectly

Browse Source 
in smb.conf.  This did work before the join rewrite.
Samba will have problems if you try to run any of the daemons
with an incorrect workgroup but it should not fail to join.

The summary is that a member server should always use it's
own machine name when setting up schannel since that is
the only account it has.  Thanks to Volker for the discussion.
This commit is contained in:
Gerald Carter 2006-06-15 12:37:05 +00:00 committed by Gerald (Jerry) Carter
parent fa19099112
commit 95763b94f7
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
source/rpc_client/cli_pipe.c
View File

@ -2446,15 +2446,18 @@ struct rpc_pipe_client *get_schannel_session_key(struct cli_state *cli,
return NULL;
}
/* A DC should use DOMAIN$ as its account name.
A member server can only use it's machine name since it
does not have an account in a trusted domain.
We don't check the domain against lp_workgroup() here since
'net ads join' has to continue to work with only the realm
specified in smb.conf. -- jerry */
if ( IS_DC && !strequal(domain, lp_workgroup()) && lp_allow_trusted_domains()) {
fstrcpy( machine_account, lp_workgroup() );
} else {
/* Hmmm. Is this correct for trusted domains when we're a member server ? JRA. */
if (strequal(domain, lp_workgroup())) {
fstrcpy(machine_account, global_myname());
} else {
fstrcpy(machine_account, domain);
}
fstrcpy(machine_account, global_myname());
}
*perr = rpccli_netlogon_setup_creds(netlogon_pipe,