diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2005-09-22 01:50:58 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:38:39 -0500 |
| commit | 51cbc188df03f9ee38599fe5a87ec2608117a845 (patch) | |
| tree | e446c68879a08f5c30de72d6029f6d7e2a32880b /source4/auth | |
| parent | 3b7f8ddd9a7c0d372a0585790913ac95c9eb3324 (diff) | |
| download | samba-51cbc188df03f9ee38599fe5a87ec2608117a845.tar.gz samba-51cbc188df03f9ee38599fe5a87ec2608117a845.tar.bz2 samba-51cbc188df03f9ee38599fe5a87ec2608117a845.zip | |
r10402: Make the RPC-SAMLOGON test pass against Win2k3 SP0 again.
I still have issues with Win2k3 SP1, and Samba4 doesn't pass it's own
test for the moment, but I'm working on these issues :-)
This required a change to the credentials API, so that the special
case for NTLM logins using a principal was indeed handled as a
special, not general case.
Also don't set the realm from a ccache, as then it overrides --option=realm=.
Andrew Bartlett
(This used to be commit 194e8f07c0cb4685797c5a7a074577c62dfdebe3)
Diffstat (limited to 'source4/auth')
| -rw-r--r-- | source4/auth/kerberos/kerberos_util.c | 2 | ||||
| -rw-r--r-- | source4/auth/ntlmssp/ntlmssp_client.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/source4/auth/kerberos/kerberos_util.c b/source4/auth/kerberos/kerberos_util.c index d0bb2f4f52..3a6aff9df8 100644 --- a/source4/auth/kerberos/kerberos_util.c +++ b/source4/auth/kerberos/kerberos_util.c @@ -60,7 +60,7 @@ krb5_error_code salt_principal_from_credentials(TALLOC_CTX *parent_ctx, return ENOMEM; } - machine_username = talloc_strdup(mem_ctx, cli_credentials_get_username(machine_account, mem_ctx)); + machine_username = talloc_strdup(mem_ctx, cli_credentials_get_username(machine_account)); if (!machine_username) { talloc_free(mem_ctx); diff --git a/source4/auth/ntlmssp/ntlmssp_client.c b/source4/auth/ntlmssp/ntlmssp_client.c index feee14a857..7801e0208d 100644 --- a/source4/auth/ntlmssp/ntlmssp_client.c +++ b/source4/auth/ntlmssp/ntlmssp_client.c @@ -164,8 +164,8 @@ NTSTATUS ntlmssp_client_challenge(struct gensec_security *gensec_security, return NT_STATUS_INVALID_PARAMETER; } - user = cli_credentials_get_username(gensec_security->credentials, out_mem_ctx); - domain = cli_credentials_get_domain(gensec_security->credentials); + cli_credentials_get_ntlm_username_domain(gensec_security->credentials, out_mem_ctx, + &user, &domain); nt_hash = cli_credentials_get_nt_hash(gensec_security->credentials, out_mem_ctx); |