diff options
| author | Gerald Carter <jerry@samba.org> | 2003-07-25 18:00:57 +0000 |
|---|---|---|
| committer | Gerald Carter <jerry@samba.org> | 2003-07-25 18:00:57 +0000 |
| commit | 6ec2213bdb163b5301196a0dddb53086e6aa0fe8 (patch) | |
| tree | 3a9c9252ce58b69beeb5bb5610be7c9aa0a32745 /source3 | |
| parent | c916e5e390ef3ca9577c2f1d3d58fdad6eec7748 (diff) | |
| download | samba-6ec2213bdb163b5301196a0dddb53086e6aa0fe8.tar.gz samba-6ec2213bdb163b5301196a0dddb53086e6aa0fe8.tar.bz2 samba-6ec2213bdb163b5301196a0dddb53086e6aa0fe8.zip | |
domain in schannel bind credentials must be the dest domain, not ours
(This used to be commit e12f6a8c13f27c3caea96b467cc4294e20dad341)
Diffstat (limited to 'source3')
| -rw-r--r-- | source3/nsswitch/winbindd_cm.c | 5 | ||||
| -rw-r--r-- | source3/rpc_client/cli_pipe.c | 4 |
2 files changed, 8 insertions, 1 deletions
diff --git a/source3/nsswitch/winbindd_cm.c b/source3/nsswitch/winbindd_cm.c index 9a16606856..f9da38660d 100644 --- a/source3/nsswitch/winbindd_cm.c +++ b/source3/nsswitch/winbindd_cm.c @@ -169,6 +169,11 @@ static NTSTATUS cm_open_connection(const char *domain, const int pipe_index, return result; } + /* set the domain if empty; needed for schannel connections */ + if ( !*new_conn->cli->domain ) + fstrcpy( new_conn->cli->domain, domain ); + + if ( !cli_nt_session_open (new_conn->cli, pipe_index) ) { result = NT_STATUS_PIPE_NOT_AVAILABLE; /* diff --git a/source3/rpc_client/cli_pipe.c b/source3/rpc_client/cli_pipe.c index 53ff58b966..2554d8c06b 100644 --- a/source3/rpc_client/cli_pipe.c +++ b/source3/rpc_client/cli_pipe.c @@ -697,8 +697,10 @@ static NTSTATUS create_rpc_bind_req(struct cli_state *cli, prs_struct *rpc_out, /* Use lp_workgroup() if domain not specified */ - if (!domain || !domain[0]) + if (!domain || !domain[0]) { + DEBUG(10,("create_rpc_bind_req: no domain; assuming my own\n")); domain = lp_workgroup(); + } init_rpc_auth_netsec_neg(&netsec_neg, domain, my_name); |