diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2005-06-29 13:55:09 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:18:57 -0500 |
| commit | 9a7481bcfeff29495334eff8803878c2c238878f (patch) | |
| tree | 040ffa0f4b35ebe93b749a7b32166a9be1e525ad /source4/auth/gensec | |
| parent | f4e75294be1f4c9d110d4ca48c5143078ade2bce (diff) | |
| download | samba-9a7481bcfeff29495334eff8803878c2c238878f.tar.gz samba-9a7481bcfeff29495334eff8803878c2c238878f.tar.bz2 samba-9a7481bcfeff29495334eff8803878c2c238878f.zip | |
r7993: Further work on the Krb5 PAC.
We now generate the PAC, and can verifiy both our own PAC and the PAC
from Win2k3.
This commit adds the PAC generation code, spits out the code to get
the information we need from the NETLOGON server back into a auth/
helper function, and adds a number of glue functions.
In the process of building the PAC generation code, some hints in the
Microsoft PAC specification shed light on other parts of the code, and
the updates to samr.idl and netlogon.idl come from those hints.
Also in this commit:
The Heimdal build package has been split up, so as to only link the
KDC with smbd, not the client utils.
To enable the PAC to be veified with gensec_krb5 (which isn't quite
dead yet), the keyblock has been passed back to the calling layer.
Andrew Bartlett
(This used to be commit e2015671c2f7501f832ff402873ffe6e53b89466)
Diffstat (limited to 'source4/auth/gensec')
| -rw-r--r-- | source4/auth/gensec/config.mk | 4 | ||||
| -rw-r--r-- | source4/auth/gensec/gensec_krb5.c | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/source4/auth/gensec/config.mk b/source4/auth/gensec/config.mk index 34587e2e45..03f7f24848 100644 --- a/source4/auth/gensec/config.mk +++ b/source4/auth/gensec/config.mk @@ -14,7 +14,7 @@ REQUIRED_SUBSYSTEMS = \ SUBSYSTEM = GENSEC INIT_FUNCTION = gensec_krb5_init INIT_OBJ_FILES = auth/gensec/gensec_krb5.o -REQUIRED_SUBSYSTEMS = NDR_KRB5PAC KERBEROS KERBEROS_LIB AUTH +REQUIRED_SUBSYSTEMS = KERBEROS AUTH # End MODULE gensec_krb5 ################################################ @@ -24,7 +24,7 @@ REQUIRED_SUBSYSTEMS = NDR_KRB5PAC KERBEROS KERBEROS_LIB AUTH SUBSYSTEM = GENSEC INIT_FUNCTION = gensec_gssapi_init INIT_OBJ_FILES = auth/gensec/gensec_gssapi.o -REQUIRED_SUBSYSTEMS = KERBEROS_LIB AUTH +REQUIRED_SUBSYSTEMS = KERBEROS AUTH # End MODULE gensec_gssapi ################################################ diff --git a/source4/auth/gensec/gensec_krb5.c b/source4/auth/gensec/gensec_krb5.c index c8367d33f7..bd705531bd 100644 --- a/source4/auth/gensec/gensec_krb5.c +++ b/source4/auth/gensec/gensec_krb5.c @@ -47,7 +47,7 @@ struct gensec_krb5_state { krb5_auth_context auth_context; krb5_ccache ccache; krb5_data ticket; - krb5_keyblock keyblock; + krb5_keyblock *keyblock; char *peer_principal; }; @@ -61,8 +61,8 @@ static int gensec_krb5_destory(void *ptr) } /* ccache freed in a child destructor */ - krb5_free_keyblock_contents(gensec_krb5_state->smb_krb5_context->krb5_context, - &gensec_krb5_state->keyblock); + krb5_free_keyblock(gensec_krb5_state->smb_krb5_context->krb5_context, + &gensec_krb5_state->keyblock); if (gensec_krb5_state->auth_context) { krb5_auth_con_free(gensec_krb5_state->smb_krb5_context->krb5_context, |