oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

export internal functions so we dont need private headers

Browse Source
This commit is contained in:
Love Hornquist Astrand
2010-11-20 14:05:54 -08:00
parent 6ce02c45a3
commit 8f2e0a7010
5 changed files with 18 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
kuser/kinit.c
View File

@@ -39,12 +39,6 @@
#include <Security/Security.h>
#endif
struct krb5_dh_moduli;
struct AlgorithmIdentifier;
struct _krb5_krb_auth_data;
struct hx509_certs_data;
#include <krb5-private.h>
#ifndef NO_NTLM
#include "heimntlm.h"
#endif
@@ -457,7 +451,7 @@ get_new_tickets(krb5_context context,
if (ret)
krb5_err(context, 1, ret, "krb5_get_init_creds_opt_set_pkinit");
if (ent_user_id)
_krb5_get_init_creds_opt_set_pkinit_user_certs(context, opt, ent_user_id);
krb5_get_init_creds_opt_set_pkinit_user_certs(context, opt, ent_user_id);
}
if (addrs_flag != -1)
@@ -768,9 +762,9 @@ main (int argc, char **argv)
parseflags |= KRB5_PRINCIPAL_PARSE_ENTERPRISE;
if (pk_enterprise_flag) {
ret = _krb5_pk_enterprise_cert(context, pk_user_id,
argv[0], &principal,
&ent_user_id);
ret = krb5_pk_enterprise_cert(context, pk_user_id,
argv[0], &principal,
&ent_user_id);
if (ret)
krb5_err(context, 1, ret, "krb5_pk_enterprise_certs");

2
lib/krb5/krb5.h
View File

@@ -847,6 +847,8 @@ typedef krb5_error_code
*
*/
struct hx509_certs_data;
#include <krb5-protos.h>
/* variables */

4
lib/krb5/libkrb5-exports.def.in
View File

@@ -766,8 +766,8 @@ EXPORTS
_krb5_expand_path_tokens ;!
; kinit helper
_krb5_get_init_creds_opt_set_pkinit_user_certs
_krb5_pk_enterprise_cert
krb5_get_init_creds_opt_set_pkinit_user_certs
krb5_pk_enterprise_cert
; testing
;! _krb5_aes_cts_encrypt

16
lib/krb5/pkinit.c
View File

@@ -2455,9 +2455,9 @@ krb5_get_init_creds_opt_set_pkinit(krb5_context context,
}
krb5_error_code KRB5_LIB_FUNCTION
_krb5_get_init_creds_opt_set_pkinit_user_certs(krb5_context context,
krb5_get_init_creds_opt *opt,
struct hx509_certs_data *certs)
krb5_get_init_creds_opt_set_pkinit_user_certs(krb5_context context,
krb5_get_init_creds_opt *opt,
struct hx509_certs_data *certs)
{
#ifdef PKINIT
if (opt->opt_private == NULL) {
@@ -2529,11 +2529,11 @@ find_ms_san(hx509_context context, hx509_cert cert, void *ctx)
*/
KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
_krb5_pk_enterprise_cert(krb5_context context,
const char *user_id,
krb5_const_realm realm,
krb5_principal *principal,
struct hx509_certs_data **res)
krb5_pk_enterprise_cert(krb5_context context,
const char *user_id,
krb5_const_realm realm,
krb5_principal *principal,
struct hx509_certs_data **res)
{
#ifdef PKINIT
krb5_error_code ret;

4
lib/krb5/version-script.map
View File

@@ -756,8 +756,8 @@ HEIMDAL_KRB5_2.0 {
_krb5_s4u2self_to_checksumdata;
# kinit helper
_krb5_get_init_creds_opt_set_pkinit_user_certs;
_krb5_pk_enterprise_cert;
krb5_get_init_creds_opt_set_pkinit_user_certs;
krb5_pk_enterprise_cert;
# testing
_krb5_aes_cts_encrypt;