r14198: Update Samba4 to current lorikeet-heimdal.

Andrew Bartlett
(This used to be commit 97a0a0e2fa6784e5fc5278f7a15b385ddcb6a3b3)

1 files changed, 2 insertions, 93 deletions

diff --git a/source4/heimdal/kdc/kdc_locl.h b/source4/heimdal/kdc/kdc_locl.h
index 58cf1f4173..ca8672c062 100644
--- a/source4/heimdal/kdc/kdc_locl.h
+++ b/source4/heimdal/kdc/kdc_locl.h
@@ -61,101 +61,10 @@ extern int detach_from_console;
 extern struct timeval _kdc_now;
 #define kdc_time (_kdc_now.tv_sec)
 
-krb5_error_code
-_kdc_as_rep(krb5_context context, 
-	    krb5_kdc_configuration *config,
-	    KDC_REQ*, const krb5_data*, krb5_data*, 
-	    const char*, struct sockaddr*);
-
-krb5_kdc_configuration *
-configure(krb5_context context, int argc, char **argv);
-
-krb5_error_code
-_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(krb5_context context, hdb_entry_ex *ent);
-
 void
 loop(krb5_context context, krb5_kdc_configuration *config);
 
-krb5_error_code
-_kdc_tgs_rep (krb5_context context, 
-	      krb5_kdc_configuration *config,
-	      KDC_REQ*, krb5_data*, const char*, struct sockaddr *);
-
-krb5_error_code
-_kdc_check_flags(krb5_context context, 
-		 krb5_kdc_configuration *config,
-		 hdb_entry *client, const char *client_name,
-		 hdb_entry *server, const char *server_name,
-		 krb5_boolean is_as_req);
-
-krb5_error_code
-_kdc_get_des_key(krb5_context context, hdb_entry_ex*, 
-		 krb5_boolean, krb5_boolean, Key**);
-
-krb5_error_code
-_kdc_encode_v4_ticket(krb5_context context, 
-		      krb5_kdc_configuration *config,
-		      void *buf, size_t len, const EncTicketPart *et,
-		      const PrincipalName *service, size_t *size);
-krb5_error_code
-_kdc_do_524(krb5_context context, 
-	    krb5_kdc_configuration *config,
-	    const Ticket *t, krb5_data *reply,
-	    const char *from, struct sockaddr *addr);
-
-
-#ifdef PKINIT
-typedef struct pk_client_params pk_client_params;
-krb5_error_code _kdc_pk_initialize(krb5_context,
-				   krb5_kdc_configuration *, 
-				   const char *,
-				   const char *);
-krb5_error_code _kdc_pk_rd_padata(krb5_context, krb5_kdc_configuration *, 
-			      KDC_REQ *, PA_DATA *, pk_client_params **);
-krb5_error_code	_kdc_pk_mk_pa_reply(krb5_context,
-				    krb5_kdc_configuration *, 
-				    pk_client_params *,
-				    const hdb_entry *,
-				    const KDC_REQ *,
-				    const krb5_data *,
-				    krb5_keyblock **,
-				    METHOD_DATA *);
-krb5_error_code _kdc_pk_check_client(krb5_context, 
-				     krb5_kdc_configuration *,
-				     krb5_principal,
-				     const hdb_entry *, 
-				     pk_client_params *, char **);
-void _kdc_pk_free_client_param(krb5_context, pk_client_params *);
-#endif
-
-/*
- * Kerberos 4
- */
-
-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_ex**);
-
-krb5_error_code
-_kdc_do_version4 (krb5_context context, 
-		  krb5_kdc_configuration *config,
-		  unsigned char*, size_t, krb5_data*, const char*, 
-		  struct sockaddr_in*);
-int
-_kdc_maybe_version4(unsigned char*, int);
-
-krb5_error_code
-_kdc_do_kaserver (krb5_context context, 
-		  krb5_kdc_configuration *config,
-		  unsigned char*, size_t, krb5_data*,
-		  const char*, struct sockaddr_in*);
-
+krb5_kdc_configuration *
+configure(krb5_context context, int argc, char **argv);
 
 #endif /* __KDC_LOCL_H__ */