From fbf106f6701c580f5839da575996de34fc953e1f Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Thu, 15 Dec 2005 20:38:24 +0000
Subject: r12269: Update to current lorikeet-heimdal.  This changed the way the
 hdb interface worked, so hdb-ldb.c and the glue have been updated.

Andrew Bartlett
(This used to be commit 8fd5224c6b5c17c3a2c04c7366b7e367012db77e)
---
 source4/heimdal/kdc/kdc_locl.h | 26 +++++++++++---------------
 1 file changed, 11 insertions(+), 15 deletions(-)

(limited to 'source4/heimdal/kdc/kdc_locl.h')

diff --git a/source4/heimdal/kdc/kdc_locl.h b/source4/heimdal/kdc/kdc_locl.h
index 8658d33b68..58cf1f4173 100644
--- a/source4/heimdal/kdc/kdc_locl.h
+++ b/source4/heimdal/kdc/kdc_locl.h
@@ -32,7 +32,7 @@
  */
 
 /* 
- * $Id: kdc_locl.h,v 1.73 2005/08/15 11:07:25 lha Exp $ 
+ * $Id: kdc_locl.h,v 1.74 2005/12/12 12:23:33 lha Exp $ 
  */
 
 #ifndef __KDC_LOCL_H__
@@ -41,6 +41,9 @@
 #include "headers.h"
 #include "kdc.h"
 
+typedef struct pk_client_params pk_client_params;
+#include <kdc-private.h>
+
 extern sig_atomic_t exit_flag;
 extern size_t max_request;
 extern const char *port_str;
@@ -68,20 +71,13 @@ krb5_kdc_configuration *
 configure(krb5_context context, int argc, char **argv);
 
 krb5_error_code
-_kdc_db_fetch(krb5_context, krb5_kdc_configuration *,
-	      krb5_principal, enum hdb_ent_type, hdb_entry **);
-
-krb5_error_code
-_kdc_db_fetch_ex(krb5_context context,
-		 krb5_kdc_configuration *config,
-		 krb5_principal principal, enum hdb_ent_type ent_type, 
-		 hdb_entry_ex **h);
-
-void
-_kdc_free_ent(krb5_context context, hdb_entry *);
+_kdc_db_fetch(krb5_context context,
+	      krb5_kdc_configuration *config,
+	      krb5_principal principal, enum hdb_ent_type ent_type, 
+	      hdb_entry_ex **h);
 
 void
-_kdc_free_ent_ex(krb5_context context, hdb_entry_ex *ent);
+_kdc_free_ent(krb5_context context, hdb_entry_ex *ent);
 
 void
 loop(krb5_context context, krb5_kdc_configuration *config);
@@ -99,7 +95,7 @@ _kdc_check_flags(krb5_context context,
 		 krb5_boolean is_as_req);
 
 krb5_error_code
-_kdc_get_des_key(krb5_context context, hdb_entry*, 
+_kdc_get_des_key(krb5_context context, hdb_entry_ex*, 
 		 krb5_boolean, krb5_boolean, Key**);
 
 krb5_error_code
@@ -145,7 +141,7 @@ void _kdc_pk_free_client_param(krb5_context, pk_client_params *);
 krb5_error_code
 _kdc_db_fetch4 (krb5_context context, 
 		krb5_kdc_configuration *config,
-		const char*, const char*, const char*, enum hdb_ent_type, hdb_entry**);
+		const char*, const char*, const char*, enum hdb_ent_type, hdb_entry_ex**);
 
 krb5_error_code
 _kdc_do_version4 (krb5_context context, 
-- 
cgit