From 8f2e0a70102fcd76d2648967a2ebc14006ed6b89 Mon Sep 17 00:00:00 2001
From: Love Hornquist Astrand <lha@h5l.org>
Date: Sat, 20 Nov 2010 14:05:54 -0800
Subject: [PATCH] export internal functions so we dont need private headers

---
 kuser/kinit.c                   | 14 ++++----------
 lib/krb5/krb5.h                 |  2 ++
 lib/krb5/libkrb5-exports.def.in |  4 ++--
 lib/krb5/pkinit.c               | 16 ++++++++--------
 lib/krb5/version-script.map     |  4 ++--
 5 files changed, 18 insertions(+), 22 deletions(-)

diff --git a/kuser/kinit.c b/kuser/kinit.c
index 11e364980..846232a4f 100644
--- a/kuser/kinit.c
+++ b/kuser/kinit.c
@@ -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");
 
diff --git a/lib/krb5/krb5.h b/lib/krb5/krb5.h
index 8f4210e19..1bdb344e6 100644
--- a/lib/krb5/krb5.h
+++ b/lib/krb5/krb5.h
@@ -847,6 +847,8 @@ typedef krb5_error_code
  *
  */
 
+struct hx509_certs_data;
+
 #include <krb5-protos.h>
 
 /* variables */
diff --git a/lib/krb5/libkrb5-exports.def.in b/lib/krb5/libkrb5-exports.def.in
index 0d94fbb8a..bddc8707d 100644
--- a/lib/krb5/libkrb5-exports.def.in
+++ b/lib/krb5/libkrb5-exports.def.in
@@ -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
diff --git a/lib/krb5/pkinit.c b/lib/krb5/pkinit.c
index 92c1200f0..1bf922baf 100644
--- a/lib/krb5/pkinit.c
+++ b/lib/krb5/pkinit.c
@@ -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;
diff --git a/lib/krb5/version-script.map b/lib/krb5/version-script.map
index 43e871214..e5d1a9606 100644
--- a/lib/krb5/version-script.map
+++ b/lib/krb5/version-script.map
@@ -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;