diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2005-05-15 23:40:22 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:16:45 -0500 |
| commit | 8f96c42027d282eec047d1b25951a33bc2fce71f (patch) | |
| tree | d45e625f98091b3ad269faabaaad2f35cfd7443e /source4/torture/auth | |
| parent | ffb8ba8cd320b7c25dabb2353d9e7245bcaefcd1 (diff) | |
| download | samba-8f96c42027d282eec047d1b25951a33bc2fce71f.tar.gz samba-8f96c42027d282eec047d1b25951a33bc2fce71f.tar.bz2 samba-8f96c42027d282eec047d1b25951a33bc2fce71f.zip | |
r6799: Remove a rudundent variable from the context structure - we can figure
this out by asking GENSEC, just like everybody else.
Andrew Bartlett
(This used to be commit 0268d6c46b73bf2097247639df2532b5e8591531)
Diffstat (limited to 'source4/torture/auth')
| -rw-r--r-- | source4/torture/auth/ntlmssp.c | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/source4/torture/auth/ntlmssp.c b/source4/torture/auth/ntlmssp.c index 644d502d99..48deb4e73a 100644 --- a/source4/torture/auth/ntlmssp.c +++ b/source4/torture/auth/ntlmssp.c @@ -39,9 +39,13 @@ BOOL torture_ntlmssp_self_check(void) gensec_set_credentials(gensec_security, cmdline_credentials); + gensec_want_feature(gensec_security, GENSEC_FEATURE_SIGN); + gensec_want_feature(gensec_security, GENSEC_FEATURE_SEAL); + status = gensec_start_mech_by_oid(gensec_security, GENSEC_OID_NTLMSSP); if (!NT_STATUS_IS_OK(status)) { + printf("Failed to start GENSEC for NTLMSSP\n"); return False; } @@ -52,8 +56,7 @@ BOOL torture_ntlmssp_self_check(void) gensec_ntlmssp_state->session_key.data, gensec_ntlmssp_state->session_key.length); - gensec_ntlmssp_state->server_use_session_keys = True; - gensec_ntlmssp_state->neg_flags = NTLMSSP_NEGOTIATE_UNICODE | NTLMSSP_NEGOTIATE_128 | NTLMSSP_NEGOTIATE_KEY_EXCH | NTLMSSP_NEGOTIATE_NTLM2; + gensec_ntlmssp_state->neg_flags = NTLMSSP_NEGOTIATE_SIGN | NTLMSSP_NEGOTIATE_UNICODE | NTLMSSP_NEGOTIATE_128 | NTLMSSP_NEGOTIATE_KEY_EXCH | NTLMSSP_NEGOTIATE_NTLM2; if (!NT_STATUS_IS_OK(status = ntlmssp_sign_init(gensec_ntlmssp_state))) { printf("Failed to sign_init: %s\n", nt_errstr(status)); @@ -83,11 +86,15 @@ BOOL torture_ntlmssp_self_check(void) status = gensec_client_start(NULL, &gensec_security); if (!NT_STATUS_IS_OK(status)) { + printf("Failed to start GENSEC for NTLMSSP\n"); return False; } gensec_set_credentials(gensec_security, cmdline_credentials); + gensec_want_feature(gensec_security, GENSEC_FEATURE_SIGN); + gensec_want_feature(gensec_security, GENSEC_FEATURE_SEAL); + status = gensec_start_mech_by_oid(gensec_security, GENSEC_OID_NTLMSSP); if (!NT_STATUS_IS_OK(status)) { @@ -101,8 +108,7 @@ BOOL torture_ntlmssp_self_check(void) gensec_ntlmssp_state->session_key.data, gensec_ntlmssp_state->session_key.length); - gensec_ntlmssp_state->server_use_session_keys = True; - gensec_ntlmssp_state->neg_flags = NTLMSSP_NEGOTIATE_UNICODE | NTLMSSP_NEGOTIATE_KEY_EXCH; + gensec_ntlmssp_state->neg_flags = NTLMSSP_NEGOTIATE_SIGN | NTLMSSP_NEGOTIATE_UNICODE | NTLMSSP_NEGOTIATE_KEY_EXCH; if (!NT_STATUS_IS_OK(status = ntlmssp_sign_init(gensec_ntlmssp_state))) { printf("Failed to sign_init: %s\n", nt_errstr(status)); |