1 files changed, 16 insertions, 69 deletions

diff --git a/crypto/heimdal/kdc/kdc_locl.h b/crypto/heimdal/kdc/kdc_locl.h
index ed69f54..fe05236 100644
--- a/crypto/heimdal/kdc/kdc_locl.h
+++ b/crypto/heimdal/kdc/kdc_locl.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997-2003 Kungliga Tekniska Högskolan
+ * Copyright (c) 1997-2005 Kungliga Tekniska Högskolan
  * (Royal Institute of Technology, Stockholm, Sweden). 
  * All rights reserved. 
  *
@@ -32,94 +32,41 @@
  */
 
 /* 
- * $Id: kdc_locl.h,v 1.58.2.2 2003/10/27 11:07:16 joda Exp $ 
+ * $Id: kdc_locl.h 22247 2007-12-08 23:49:41Z lha $ 
  */
 
 #ifndef __KDC_LOCL_H__
 #define __KDC_LOCL_H__
 
 #include "headers.h"
+#include "kdc.h"
 
-extern krb5_context context;
+typedef struct pk_client_params pk_client_params;
+#include <kdc-private.h>
 
-extern int require_preauth;
 extern sig_atomic_t exit_flag;
 extern size_t max_request;
-extern time_t kdc_warn_pwexpire;
-extern struct dbinfo {
-    char *realm;
-    char *dbname;
-    char *mkey_file;
-    struct dbinfo *next;
-} *databases;
-extern HDB **db;
-extern int num_db;
+extern const char *request_log;
 extern const char *port_str;
 extern krb5_addresses explicit_addresses;
 
 extern int enable_http;
-extern krb5_boolean encode_as_rep_as_tgs_rep;
-extern krb5_boolean check_ticket_addresses;
-extern krb5_boolean allow_null_ticket_addresses;
-extern krb5_boolean allow_anonymous;
-enum { TRPOLICY_ALWAYS_CHECK,
-       TRPOLICY_ALLOW_PER_PRINCIPAL, 
-       TRPOLICY_ALWAYS_HONOUR_REQUEST };
-extern int trpolicy;
-extern int enable_524;
-extern int enable_v4_cross_realm;
 
-#ifdef KRB4
-extern char *v4_realm;
-extern int enable_v4;
-extern krb5_boolean enable_kaserver;
-#endif
+#define DETACH_IS_DEFAULT FALSE
 
-#define _PATH_KDC_CONF		HDB_DB_DIR "/kdc.conf"
-#define DEFAULT_LOG_DEST	"0-1/FILE:" HDB_DB_DIR "/kdc.log"
+extern int detach_from_console;
 
-extern struct timeval now;
-#define kdc_time (now.tv_sec)
+extern const struct units _kdc_digestunits[];
 
-krb5_error_code as_rep (KDC_REQ*, krb5_data*, const char*, struct sockaddr*);
-void configure (int, char**);
-krb5_error_code db_fetch (krb5_principal, hdb_entry**);
-void free_ent(hdb_entry *);
-void kdc_log (int, const char*, ...)
-    __attribute__ ((format (printf, 2,3)));
+#define KDC_LOG_FILE		"kdc.log"
 
-char* kdc_log_msg (int, const char*, ...)
-    __attribute__ ((format (printf, 2,3)));
-char* kdc_log_msg_va (int, const char*, va_list)
-    __attribute__ ((format (printf, 2,0)));
-void kdc_openlog (void);
-void loop (void);
-void set_master_key (EncryptionKey);
-krb5_error_code tgs_rep (KDC_REQ*, krb5_data*, const char*, struct sockaddr *);
-Key* unseal_key (Key*);
-krb5_error_code check_flags(hdb_entry *client, const char *client_name,
-			    hdb_entry *server, const char *server_name,
-			    krb5_boolean is_as_req);
+extern struct timeval _kdc_now;
+#define kdc_time (_kdc_now.tv_sec)
 
-krb5_error_code get_des_key(hdb_entry*, krb5_boolean, krb5_boolean, Key**);
-krb5_error_code encode_v4_ticket (void*, size_t, const EncTicketPart*, 
-				  const PrincipalName*, size_t*);
-krb5_error_code do_524 (const Ticket*, krb5_data*, const char*, struct sockaddr*);
+void
+loop(krb5_context context, krb5_kdc_configuration *config);
 
-#ifdef KRB4
-krb5_error_code db_fetch4 (const char*, const char*, const char*, hdb_entry**);
-krb5_error_code do_version4 (unsigned char*, size_t, krb5_data*, const char*, 
-			     struct sockaddr_in*);
-int maybe_version4 (unsigned char*, int);
-#endif
-
-#ifdef KRB4
-krb5_error_code do_kaserver (unsigned char*, size_t, krb5_data*, const char*, 
-			     struct sockaddr_in*);
-#endif
-
-#ifdef HAVE_OPENSSL
-#define des_new_random_key des_random_key
-#endif
+krb5_kdc_configuration *
+configure(krb5_context context, int argc, char **argv);
 
 #endif /* __KDC_LOCL_H__ */