diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2004-05-09 12:42:18 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 12:51:51 -0500 |
| commit | dce84ffd379012812170f68f7de8aab73123f0b3 (patch) | |
| tree | c5f6973838572fd06c07d6771f5286bc2073b569 /source4/include | |
| parent | 55fa62be31c9027d84be0e4caad3ee59d78ca1b0 (diff) | |
| download | samba-dce84ffd379012812170f68f7de8aab73123f0b3.tar.gz samba-dce84ffd379012812170f68f7de8aab73123f0b3.tar.bz2 samba-dce84ffd379012812170f68f7de8aab73123f0b3.zip | |
r610: - Merge the Samba3 'ntlm_auth --diagnostics' testsuite to Samba4.
- This required using NETLOGON_NEG_AUTH2_FLAGS for the
SetupCredentials2 negotiation flags, which is what Samba3 does,
because otherwise the server uses different crypto.
- This tests the returned session keys, which we decrypt.
- Update the Samba4 notion of a 'session key' to be a DATA_BLOB in
most places.
- Fix session key code to return NT_STATUS_NO_SESSION_KEY if none is
available.
- Remove a useless argument to SMBsesskeygen_ntv1
- move netr_CredentialState from the .idl to the new credentials.h
Andrew Bartlett
(This used to be commit 44f8b5b53e6abd4de8a676f78d729988fadff320)
Diffstat (limited to 'source4/include')
| -rw-r--r-- | source4/include/cli_context.h | 6 | ||||
| -rw-r--r-- | source4/include/includes.h | 1 |
2 files changed, 3 insertions, 4 deletions
diff --git a/source4/include/cli_context.h b/source4/include/cli_context.h index 0e817c3cb0..9cd36d0c35 100644 --- a/source4/include/cli_context.h +++ b/source4/include/cli_context.h @@ -66,10 +66,6 @@ struct cli_negotiate { unsigned int writebraw_supported:1; const char *server_domain; - - /* remember the session key for data encryption in various sub-protocols - such as LSA */ - uint8 user_session_key[16]; }; /* this is the context for a SMB socket associated with the socket itself */ @@ -189,6 +185,8 @@ struct cli_session { /* default pid for this session */ uint32 pid; + + DATA_BLOB user_session_key; }; /* diff --git a/source4/include/includes.h b/source4/include/includes.h index 622b68b1af..de06b4d8a5 100644 --- a/source4/include/includes.h +++ b/source4/include/includes.h @@ -709,6 +709,7 @@ extern int errno; #include "hmacmd5.h" #include "libcli/auth/ntlmssp.h" +#include "libcli/auth/credentials.h" #include "libcli/auth/schannel.h" #include "auth/auth.h" |