diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2004-01-08 02:57:42 +0000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2004-01-08 02:57:42 +0000 |
| commit | e0ec9d2d5697bf95626da736f6f9552e10e52ffc (patch) | |
| tree | 029f1af03ab62e98ca6063639679e7af79323633 | |
| parent | 88d8644ef7f588f585530cbefc1dc5a2133c1114 (diff) | |
| download | samba-e0ec9d2d5697bf95626da736f6f9552e10e52ffc.tar.gz samba-e0ec9d2d5697bf95626da736f6f9552e10e52ffc.tar.bz2 samba-e0ec9d2d5697bf95626da736f6f9552e10e52ffc.zip | |
Make it clearer that the domain here is the domain of the user for
authentication.
Andrew Bartlett
(This used to be commit 7e6cc8f0037f9948230a1e1bd380f30cec5d511e)
| -rw-r--r-- | source3/libsmb/cliconnect.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/source3/libsmb/cliconnect.c b/source3/libsmb/cliconnect.c index f466b665eb..1dc46ab0e6 100644 --- a/source3/libsmb/cliconnect.c +++ b/source3/libsmb/cliconnect.c @@ -544,7 +544,7 @@ static NTSTATUS cli_session_setup_kerberos(struct cli_state *cli, const char *pr ****************************************************************************/ static NTSTATUS cli_session_setup_ntlmssp(struct cli_state *cli, const char *user, - const char *pass, const char *workgroup) + const char *pass, const char *domain) { struct ntlmssp_state *ntlmssp_state; NTSTATUS nt_status; @@ -563,7 +563,7 @@ static NTSTATUS cli_session_setup_ntlmssp(struct cli_state *cli, const char *use if (!NT_STATUS_IS_OK(nt_status = ntlmssp_set_username(ntlmssp_state, user))) { return nt_status; } - if (!NT_STATUS_IS_OK(nt_status = ntlmssp_set_domain(ntlmssp_state, workgroup))) { + if (!NT_STATUS_IS_OK(nt_status = ntlmssp_set_domain(ntlmssp_state, domain))) { return nt_status; } if (!NT_STATUS_IS_OK(nt_status = ntlmssp_set_password(ntlmssp_state, pass))) { @@ -662,7 +662,7 @@ static NTSTATUS cli_session_setup_ntlmssp(struct cli_state *cli, const char *use ****************************************************************************/ NTSTATUS cli_session_setup_spnego(struct cli_state *cli, const char *user, - const char *pass, const char *workgroup) + const char *pass, const char *domain) { char *principal; char *OIDs[ASN1_MAX_OIDS]; @@ -723,7 +723,7 @@ NTSTATUS cli_session_setup_spnego(struct cli_state *cli, const char *user, } } - return cli_session_setup_kerberos(cli, principal, workgroup); + return cli_session_setup_kerberos(cli, principal, domain); } #endif @@ -731,7 +731,7 @@ NTSTATUS cli_session_setup_spnego(struct cli_state *cli, const char *user, ntlmssp: - return cli_session_setup_ntlmssp(cli, user, pass, workgroup); + return cli_session_setup_ntlmssp(cli, user, pass, domain); } /**************************************************************************** |