diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2009-11-13 10:51:14 +1100 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2009-11-13 23:19:05 +1100 |
| commit | 4f8ba5ad6ac9b7153b0e13654e59f47e67b3f608 (patch) | |
| tree | ca189d440b0a298cdcb3769d994828508dcd2e76 /source4/heimdal/lib/krb5/krb5_locl.h | |
| parent | 5bc87c14a1f5b45ed86e7ff9663f5f0aa2f70094 (diff) | |
| download | samba-4f8ba5ad6ac9b7153b0e13654e59f47e67b3f608.tar.gz samba-4f8ba5ad6ac9b7153b0e13654e59f47e67b3f608.tar.bz2 samba-4f8ba5ad6ac9b7153b0e13654e59f47e67b3f608.zip | |
s4:heimdal: import lorikeet-heimdal-200911122202 (commit 9291fd2d101f3eecec550178634faa94ead3e9a1)
Diffstat (limited to 'source4/heimdal/lib/krb5/krb5_locl.h')
| -rw-r--r-- | source4/heimdal/lib/krb5/krb5_locl.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/source4/heimdal/lib/krb5/krb5_locl.h b/source4/heimdal/lib/krb5/krb5_locl.h index 71dc1327c6..d436215769 100644 --- a/source4/heimdal/lib/krb5/krb5_locl.h +++ b/source4/heimdal/lib/krb5/krb5_locl.h @@ -136,6 +136,8 @@ struct sockaddr_dl; #include <door.h> #endif +#include <com_err.h> + #include <roken.h> #include <parse_time.h> #include <base64.h> @@ -151,6 +153,7 @@ struct sockaddr_dl; struct send_to_kdc; /* XXX glue for pkinit */ +struct hx509_certs_data; struct krb5_pk_identity; struct krb5_pk_cert; struct ContentInfo; @@ -265,6 +268,9 @@ typedef struct krb5_context_data { #define KRB5_CTX_F_CHECK_PAC 2 #define KRB5_CTX_F_HOMEDIR_ACCESS 4 struct send_to_kdc *send_to_kdc; +#ifdef PKINIT + hx509_context hx509ctx; +#endif } krb5_context_data; #define KRB5_DEFAULT_CCNAME_FILE "FILE:/tmp/krb5cc_%{uid}" @@ -295,7 +301,6 @@ typedef struct krb5_context_data { #ifdef PKINIT struct krb5_pk_identity { - hx509_context hx509ctx; hx509_verify_ctx verify_ctx; hx509_certs certs; hx509_cert cert; |