diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2005-10-20 03:47:55 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:45:00 -0500 |
| commit | 372ca26b2052e267711a45c8bf341f55505f3f8f (patch) | |
| tree | 8c13e34fdac62ca762972d25cfe95b053bff93fa /source4/smb_server/smb_server.h | |
| parent | 9e25f33a1a06e1374bb643cb087af0e0bedb99c7 (diff) | |
| download | samba-372ca26b2052e267711a45c8bf341f55505f3f8f.tar.gz samba-372ca26b2052e267711a45c8bf341f55505f3f8f.tar.bz2 samba-372ca26b2052e267711a45c8bf341f55505f3f8f.zip | |
r11200: Reposition the creation of the kerberos keytab for GSSAPI and Krb5
authentication. This pulls the creating of the keytab back to the
credentials code, and removes the special case of 'use keberos keytab
= yes' for now.
This allows (and requires) the callers to specify the credentials for
the server credentails to GENSEC. This allows kpasswdd (soon to be
added) to use a different set of kerberos credentials.
The 'use kerberos keytab' code will be moved into the credentials
layer, as the layers below now expect a keytab.
We also now allow for the old secret to be stored into the
credentials, allowing service password changes.
Andrew Bartlett
(This used to be commit 205f77c579ac8680c85f713a76de5767189c627b)
Diffstat (limited to 'source4/smb_server/smb_server.h')
| -rw-r--r-- | source4/smb_server/smb_server.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source4/smb_server/smb_server.h b/source4/smb_server/smb_server.h index 01fb1e26a3..360ea7ddfb 100644 --- a/source4/smb_server/smb_server.h +++ b/source4/smb_server/smb_server.h @@ -194,8 +194,8 @@ struct smbsrv_connection { /* authentication context for multi-part negprot */ struct auth_context *auth_context; - /* state of NTLMSSP auth */ - struct auth_ntlmssp_state *ntlmssp_state; + /* reference to the kerberos keytab, or machine trust account */ + struct cli_credentials *server_credentials; /* did we tell the client we support encrypted passwords? */ BOOL encrypted_passwords; |