Merge mskrb-integ onto trunk

The mskrb-integ branch includes support for the following projects:
Projects/Aliases
* Projects/PAC and principal APIs
* Projects/AEAD encryption API
* Projects/GSSAPI DCE
* Projects/RFC 3244

In addition, it includes support for enctype negotiation, and a variety of GSS-API extensions.
In the KDC it includes support for protocol transition, constrained delegation
and a new authorization data interface.
The old authorization data interface is also supported.

This commit merges the mskrb-integ branch on to the trunk.
Additional review and testing is required.

Merge commit 'mskrb-integ' into trunk

ticket: new
status: open

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@21690 dc483132-0cff-0310-8789-dd5450dbe970

10 files changed, 1108 insertions, 28 deletions

diff --git a/src/include/Makefile.in b/src/include/Makefile.in
index caba002f3..0dfea12b5 100644
--- a/src/include/Makefile.in
+++ b/src/include/Makefile.in
@@ -65,6 +65,7 @@ PROCESS_REPLACE = -e "s+@KRB5RCTMPDIR+$(KRB5RCTMPDIR)+" \
 		  -e "s+@LIBDIR+$(LIBDIR)+" \
 		  -e "s+@SBINDIR+$(SBINDIR)+" \
 		  -e "s+@MODULEDIR+$(MODULE_DIR)+" \
+		  -e "s+@GSSMODULEDIR+$(GSS_MODULE_DIR)+" \
 	-e 's+@LOCALSTATEDIR+$(LOCALSTATEDIR)+' \
 	-e 's+@SYSCONFDIR+$(SYSCONFDIR)+' 
 
@@ -134,4 +135,7 @@ install-headers-unix install:: krb5/krb5.h profile.h
 	$(INSTALL_DATA) krb5/krb5.h $(DESTDIR)$(KRB5_INCDIR)$(S)krb5$(S)krb5.h
 	$(INSTALL_DATA) $(srcdir)/krb5/locate_plugin.h $(DESTDIR)$(KRB5_INCDIR)$(S)krb5$(S)locate_plugin.h
 	$(INSTALL_DATA) profile.h $(DESTDIR)$(KRB5_INCDIR)$(S)profile.h
+	$(INSTALL_DATA) kdb.h $(DESTDIR)$(KRB5_INCDIR)$(S)kdb.h
+	$(INSTALL_DATA) kdb_ext.h $(DESTDIR)$(KRB5_INCDIR)$(S)kdb_ext.h
+	$(INSTALL_DATA) kdb_kt.h $(DESTDIR)$(KRB5_INCDIR)$(S)kdb_kt.h
 	$(INSTALL_DATA) $(srcdir)/gssapi.h $(DESTDIR)$(KRB5_INCDIR)$(S)gssapi.h
diff --git a/src/include/k5-int.h b/src/include/k5-int.h
index 883de3e18..43f130710 100644
--- a/src/include/k5-int.h
+++ b/src/include/k5-int.h
@@ -213,6 +213,10 @@ typedef INT64_TYPE krb5_int64;
 					   /* required */
 #define KDC_ERR_SERVER_NOMATCH		26 /* Requested server and */
 					   /* ticket don't match*/
+#define KDC_ERR_MUST_USE_USER2USER	27 /* Server principal valid for */
+					   /*	user2user only */
+#define KDC_ERR_PATH_NOT_ACCEPTED	28 /* KDC policy rejected transited */
+					   /*	path */
 #define KDC_ERR_SVC_UNAVAILABLE		29 /* A service is not
 					    * available that is
 					    * required to process the
@@ -251,13 +255,19 @@ typedef INT64_TYPE krb5_int64;
 
 /* PKINIT server-reported errors */
 #define KDC_ERR_CLIENT_NOT_TRUSTED		62 /* client cert not trusted */
+#define KDC_ERR_KDC_NOT_TRUSTED			63
 #define KDC_ERR_INVALID_SIG			64 /* client signature verify failed */
 #define KDC_ERR_DH_KEY_PARAMETERS_NOT_ACCEPTED	65 /* invalid Diffie-Hellman parameters */
+#define KDC_ERR_CERTIFICATE_MISMATCH		66
+#define KRB_AP_ERR_NO_TGT			67
+#define KDC_ERR_WRONG_REALM			68
+#define KRB_AP_ERR_USER_TO_USER_REQUIRED	69
 #define KDC_ERR_CANT_VERIFY_CERTIFICATE		70 /* client cert not verifiable to */
 						   /* trusted root cert */
 #define KDC_ERR_INVALID_CERTIFICATE		71 /* client cert had invalid signature */
 #define KDC_ERR_REVOKED_CERTIFICATE		72 /* client cert was revoked */
 #define KDC_ERR_REVOCATION_STATUS_UNKNOWN	73 /* client cert revoked, reason unknown */
+#define KDC_ERR_REVOCATION_STATUS_UNAVAILABLE	74
 #define KDC_ERR_CLIENT_NAME_MISMATCH		75 /* mismatch between client cert and */
 						   /* principal name */
 #define KDC_ERR_INCONSISTENT_KEY_PURPOSE	77 /* bad extended key use */
@@ -303,6 +313,12 @@ typedef struct _krb5_etype_info_entry {
 
 typedef krb5_etype_info_entry ** krb5_etype_info;
 
+/* RFC 4537 */
+typedef struct _krb5_etype_list {
+	int		length;
+	krb5_enctype	*etypes;
+} krb5_etype_list;
+
 /*
  * a sam_challenge is returned for alternate preauth 
  */
@@ -611,9 +627,9 @@ struct krb5_keyhash_provider {
     krb5_error_code (*verify_iov) (const krb5_keyblock *key,
 				  krb5_keyusage keyusage,
 				  const krb5_data *ivec,
-				  const krb5_data *input,
 				  const krb5_crypto_iov *data,
 				  size_t num_data,
+				  const krb5_data *hash,
 				  krb5_boolean *valid);
 };
 
@@ -622,7 +638,7 @@ struct krb5_aead_provider {
 				      const struct krb5_enc_provider *enc,
 				      const struct krb5_hash_provider *hash,
 				      krb5_cryptotype type,
-				      size_t *length);
+				      unsigned int *length);
     krb5_error_code (*encrypt_iov) (const struct krb5_aead_provider *aead,
 				    const struct krb5_enc_provider *enc,
 				    const struct krb5_hash_provider *hash,
@@ -717,7 +733,7 @@ krb5_error_code krb5_hmac
 		const krb5_keyblock *key, unsigned int icount,
 		const krb5_data *input, krb5_data *output);
 
-krb5_error_code krb5_hmac_iov
+krb5_error_code krb5int_hmac_iov
 (const struct krb5_hash_provider *hash,
 		const krb5_keyblock *key,
 		const krb5_crypto_iov *data, size_t num_data,
@@ -923,6 +939,12 @@ typedef struct _krb5_pa_enc_ts {
     krb5_int32		pausec;
 } krb5_pa_enc_ts;
 
+typedef struct _krb5_pa_for_user {
+    krb5_principal	user;
+    krb5_checksum	cksum;
+    krb5_data		auth_package;
+} krb5_pa_for_user;
+
 typedef krb5_error_code (*krb5_preauth_obtain_proc)
     (krb5_context,
 		    krb5_pa_data *,
@@ -1200,6 +1222,16 @@ void KRB5_CALLCONV krb5_free_enc_sam_response_enc_2_contents
  
 void KRB5_CALLCONV krb5_free_pa_enc_ts
 	(krb5_context, krb5_pa_enc_ts *);
+void KRB5_CALLCONV krb5_free_pa_for_user
+	(krb5_context, krb5_pa_for_user * );
+void KRB5_CALLCONV krb5_free_pa_svr_referral_data
+	(krb5_context, krb5_pa_svr_referral_data * );
+void KRB5_CALLCONV krb5_free_pa_server_referral_data
+	(krb5_context, krb5_pa_server_referral_data * );
+void KRB5_CALLCONV krb5_free_pa_pac_req
+	(krb5_context, krb5_pa_pac_req * );
+void KRB5_CALLCONV krb5_free_etype_list
+	(krb5_context, krb5_etype_list * );
 
 /* #include "krb5/wordsize.h" -- comes in through base-defs.h. */
 #include "com_err.h"
@@ -1522,7 +1554,22 @@ struct krb5_setpw_req {
     krb5_data password;
 };
 krb5_error_code encode_krb5_setpw_req
-(const struct krb5_setpw_req *rep, krb5_data **code);
+	(const struct krb5_setpw_req *rep, krb5_data **code);
+
+krb5_error_code encode_krb5_pa_for_user
+	(const krb5_pa_for_user * , krb5_data **);
+
+krb5_error_code encode_krb5_pa_svr_referral_data
+	(const krb5_pa_svr_referral_data * , krb5_data **);
+
+krb5_error_code encode_krb5_pa_server_referral_data
+	(const krb5_pa_server_referral_data * , krb5_data **);
+
+krb5_error_code encode_krb5_pa_pac_req
+	(const krb5_pa_pac_req * , krb5_data **);
+
+krb5_error_code encode_krb5_etype_list
+	(const krb5_etype_list * , krb5_data **);
 
 /*************************************************************************
  * End of prototypes for krb5_encode.c
@@ -1665,6 +1712,24 @@ krb5_error_code decode_krb5_pa_enc_ts
 krb5_error_code decode_krb5_sam_key
 	(const krb5_data *, krb5_sam_key **);
 
+krb5_error_code decode_krb5_setpw_req
+	(const krb5_data *, krb5_data **, krb5_principal *);
+
+krb5_error_code decode_krb5_pa_for_user
+	(const krb5_data *, krb5_pa_for_user **);
+
+krb5_error_code decode_krb5_pa_svr_referral_data
+	(const krb5_data *, krb5_pa_svr_referral_data **);
+
+krb5_error_code decode_krb5_pa_server_referral_data
+	(const krb5_data *, krb5_pa_server_referral_data **);
+
+krb5_error_code decode_krb5_pa_pac_req
+	(const krb5_data *, krb5_pa_pac_req **);
+
+krb5_error_code decode_krb5_etype_list
+	(const krb5_data *, krb5_etype_list **);
+
 struct _krb5_key_data;		/* kdb.h */
 
 struct ldap_seqof_key_data {
@@ -1835,7 +1900,8 @@ void krb5int_set_prompt_types
 
 krb5_error_code
 krb5int_generate_and_save_subkey (krb5_context, krb5_auth_context,
-				  krb5_keyblock * /* Old keyblock, not new!  */);
+				  krb5_keyblock * /* Old keyblock, not new!  */,
+				  krb5_enctype);
 
 /* set and change password helpers */
 
@@ -1906,10 +1972,6 @@ typedef struct _krb5int_access {
 				   const krb5_keyblock *key,
 				   unsigned int icount, const krb5_data *input,
 				   krb5_data *output);
-    krb5_error_code (* krb5_hmac_iov) (const struct krb5_hash_provider *hash,
-				       const krb5_keyblock *key,
-				       const krb5_crypto_iov *data, size_t num_data,
-				       krb5_data *output);
     /* service location and communication */
     krb5_error_code (*sendto_udp) (krb5_context, const krb5_data *msg,
 				   const struct addrlist *, struct sendto_callback_info*, krb5_data *reply,
@@ -1929,6 +1991,7 @@ typedef struct _krb5int_access {
 					    struct srv_dns_entry **answers);
     void (*free_srv_dns_data)(struct srv_dns_entry *);
     int (*use_dns_kdc)(krb5_context);
+    krb5_error_code (*clean_hostname)(krb5_context, const char *, char *, size_t);
 
     /* krb4 compatibility stuff -- may be null if not enabled */
     krb5_int32 (*krb_life_to_time)(krb5_int32, int);
@@ -1943,7 +2006,7 @@ typedef struct _krb5int_access {
 
     /* Used for KDB LDAP back end.  */
     krb5_error_code
-    (*asn1_ldap_encode_sequence_of_keys) (ldap_seqof_key_data *val,
+    (*asn1_ldap_encode_sequence_of_keys) (const ldap_seqof_key_data *val,
 					  krb5_data **code);
 
     krb5_error_code
@@ -2021,6 +2084,7 @@ typedef struct _krb5int_access {
         (const krb5_sam_response_2 *rep, krb5_data **code);
     krb5_error_code (*encode_krb5_enc_sam_response_enc_2)
         (const krb5_enc_sam_response_enc_2 *rep, krb5_data **code);
+
 } krb5int_access;
 
 #define KRB5INT_ACCESS_VERSION \
@@ -2227,7 +2291,7 @@ extern int krb5int_prng_init(void);
 /*
  * Referral definitions, debugging hooks, and subfunctions.
  */
-#define        KRB5_REFERRAL_MAXHOPS	5
+#define        KRB5_REFERRAL_MAXHOPS	10
 /* #define DEBUG_REFERRALS */
 
 #ifdef DEBUG_REFERRALS
@@ -2360,6 +2424,11 @@ void krb5_free_ets
 krb5_error_code krb5_generate_subkey
 	(krb5_context,
 		const krb5_keyblock *, krb5_keyblock **);
+krb5_error_code krb5_generate_subkey_extended
+	(krb5_context,
+		const krb5_keyblock *,
+		krb5_enctype,
+		krb5_keyblock **);
 krb5_error_code krb5_generate_seq_number
 	(krb5_context,
 		const krb5_keyblock *, krb5_ui_4 *);
@@ -2608,4 +2677,14 @@ static inline int authdata_eq (krb5_authdata a1, krb5_authdata a2)
 	    && a1.length == a2.length
 	    && !memcmp(a1.contents, a2.contents, a1.length));
 }
+
+krb5_error_code KRB5_CALLCONV
+krb5int_pac_sign(krb5_context context,
+		 krb5_pac pac,
+		 krb5_timestamp authtime,
+		 krb5_const_principal principal,
+		 const krb5_keyblock *server_key,
+		 const krb5_keyblock *privsvr_key,
+		 krb5_data *data);
+
 #endif /* _KRB5_INT_H */
diff --git a/src/include/k5-plugin.h b/src/include/k5-plugin.h
index 5bb9be7a0..f5f4f43c2 100644
--- a/src/include/k5-plugin.h
+++ b/src/include/k5-plugin.h
@@ -45,6 +45,9 @@
 
    So, no krb5 types.  */
 
+#ifndef K5_PLUGIN_H
+#define K5_PLUGIN_H
+
 #if defined(_MSDOS) || defined(_WIN32)
 #include "win-mac.h"
 #endif
@@ -102,3 +105,5 @@ krb5int_get_plugin_dir_func (struct plugin_dir_handle *, const char *,
 			     void (***)(void), struct errinfo *);
 void KRB5_CALLCONV 
 krb5int_free_plugin_dir_func (void (**)(void));
+
+#endif /* K5_PLUGIN_H */
diff --git a/src/include/k5-unicode.h b/src/include/k5-unicode.h
new file mode 100644
index 000000000..8955a9944
--- /dev/null
+++ b/src/include/k5-unicode.h
@@ -0,0 +1,130 @@
+/*
+ * Copyright (C) 2008 by the Massachusetts Institute of Technology,
+ * Cambridge, MA, USA.  All Rights Reserved.
+ * 
+ * This software is being provided to you, the LICENSEE, by the 
+ * Massachusetts Institute of Technology (M.I.T.) under the following 
+ * license.  By obtaining, using and/or copying this software, you agree 
+ * that you have read, understood, and will comply with these terms and 
+ * conditions:  
+ * 
+ * Export of this software from the United States of America may
+ * require a specific license from the United States Government.
+ * It is the responsibility of any person or organization contemplating
+ * export to obtain such a license before exporting.
+ * 
+ * WITHIN THAT CONSTRAINT, permission to use, copy, modify and distribute 
+ * this software and its documentation for any purpose and without fee or 
+ * royalty is hereby granted, provided that you agree to comply with the 
+ * following copyright notice and statements, including the disclaimer, and 
+ * that the same appear on ALL copies of the software and documentation, 
+ * including modifications that you make for internal use or for 
+ * distribution:
+ * 
+ * THIS SOFTWARE IS PROVIDED "AS IS", AND M.I.T. MAKES NO REPRESENTATIONS 
+ * OR WARRANTIES, EXPRESS OR IMPLIED.  By way of example, but not 
+ * limitation, M.I.T. MAKES NO REPRESENTATIONS OR WARRANTIES OF 
+ * MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF 
+ * THE LICENSED SOFTWARE OR DOCUMENTATION WILL NOT INFRINGE ANY THIRD PARTY 
+ * PATENTS, COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS.   
+ * 
+ * The name of the Massachusetts Institute of Technology or M.I.T. may NOT 
+ * be used in advertising or publicity pertaining to distribution of the 
+ * software.  Title to copyright in this software and any associated 
+ * documentation shall at all times remain with M.I.T., and USER agrees to 
+ * preserve same.
+ *
+ * Furthermore if you modify this software you must label
+ * your software as modified software and not distribute it in such a
+ * fashion that it might be confused with the original M.I.T. software.  
+ */
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 1998-2008 The OpenLDAP Foundation.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted only as authorized by the OpenLDAP
+ * Public License.
+ *
+ * A copy of this license is available in file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * <http://www.OpenLDAP.org/license.html>.
+ */
+/* This notice applies to changes, created by or for Novell, Inc.,
+ * to preexisting works for which notices appear elsewhere in this file.
+ *
+ * Copyright (C) 2000 Novell, Inc. All Rights Reserved.
+ *
+ * THIS WORK IS SUBJECT TO U.S. AND INTERNATIONAL COPYRIGHT LAWS AND TREATIES.
+ * USE, MODIFICATION, AND REDISTRIBUTION OF THIS WORK IS SUBJECT TO VERSION
+ * 2.0.1 OF THE OPENLDAP PUBLIC LICENSE, A COPY OF WHICH IS AVAILABLE AT
+ * HTTP://WWW.OPENLDAP.ORG/LICENSE.HTML OR IN THE FILE "LICENSE" IN THE
+ * TOP-LEVEL DIRECTORY OF THE DISTRIBUTION. ANY USE OR EXPLOITATION OF THIS
+ * WORK OTHER THAN AS AUTHORIZED IN VERSION 2.0.1 OF THE OPENLDAP PUBLIC
+ * LICENSE, OR OTHER PRIOR WRITTEN CONSENT FROM NOVELL, COULD SUBJECT THE
+ * PERPETRATOR TO CRIMINAL AND CIVIL LIABILITY.
+ */
+
+#ifndef K5_UNICODE_H
+#define K5_UNICODE_H
+
+#include "autoconf.h"
+
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+
+#ifdef HAVE_STDLIB_H
+#include <stdlib.h>
+#endif
+
+#include "k5-utf8.h"
+
+typedef krb5_ucs4 krb5_unicode;
+
+int krb5int_ucstrncmp(
+    const krb5_unicode *,
+    const krb5_unicode *,
+    size_t);
+
+int krb5int_ucstrncasecmp(
+    const krb5_unicode *,
+    const krb5_unicode *,
+    size_t);
+
+krb5_unicode *krb5int_ucstrnchr(
+    const krb5_unicode *,
+    size_t,
+    krb5_unicode);
+
+krb5_unicode *krb5int_ucstrncasechr(
+    const krb5_unicode *,
+    size_t,
+    krb5_unicode);
+
+void krb5int_ucstr2upper(
+    krb5_unicode *,
+    size_t);
+
+#define KRB5_UTF8_NOCASEFOLD	0x0U
+#define KRB5_UTF8_CASEFOLD	0x1U
+#define KRB5_UTF8_ARG1NFC	0x2U
+#define KRB5_UTF8_ARG2NFC	0x4U
+#define KRB5_UTF8_APPROX	0x8U
+
+krb5_data * krb5int_utf8_normalize(
+    krb5_data *,
+    krb5_data *,
+    unsigned);
+
+int krb5int_utf8_normcmp(
+    const krb5_data *,
+    const krb5_data *,
+    unsigned);
+
+#endif /* K5_UNICODE_H */
diff --git a/src/include/k5-utf8.h b/src/include/k5-utf8.h
new file mode 100644
index 000000000..b5a394559
--- /dev/null
+++ b/src/include/k5-utf8.h
@@ -0,0 +1,252 @@
+/*
+ * Copyright (C) 2008 by the Massachusetts Institute of Technology,
+ * Cambridge, MA, USA.  All Rights Reserved.
+ * 
+ * This software is being provided to you, the LICENSEE, by the 
+ * Massachusetts Institute of Technology (M.I.T.) under the following 
+ * license.  By obtaining, using and/or copying this software, you agree 
+ * that you have read, understood, and will comply with these terms and 
+ * conditions:  
+ * 
+ * Export of this software from the United States of America may
+ * require a specific license from the United States Government.
+ * It is the responsibility of any person or organization contemplating
+ * export to obtain such a license before exporting.
+ * 
+ * WITHIN THAT CONSTRAINT, permission to use, copy, modify and distribute 
+ * this software and its documentation for any purpose and without fee or 
+ * royalty is hereby granted, provided that you agree to comply with the 
+ * following copyright notice and statements, including the disclaimer, and 
+ * that the same appear on ALL copies of the software and documentation, 
+ * including modifications that you make for internal use or for 
+ * distribution:
+ * 
+ * THIS SOFTWARE IS PROVIDED "AS IS", AND M.I.T. MAKES NO REPRESENTATIONS 
+ * OR WARRANTIES, EXPRESS OR IMPLIED.  By way of example, but not 
+ * limitation, M.I.T. MAKES NO REPRESENTATIONS OR WARRANTIES OF 
+ * MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF 
+ * THE LICENSED SOFTWARE OR DOCUMENTATION WILL NOT INFRINGE ANY THIRD PARTY 
+ * PATENTS, COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS.   
+ * 
+ * The name of the Massachusetts Institute of Technology or M.I.T. may NOT 
+ * be used in advertising or publicity pertaining to distribution of the 
+ * software.  Title to copyright in this software and any associated 
+ * documentation shall at all times remain with M.I.T., and USER agrees to 
+ * preserve same.
+ *
+ * Furthermore if you modify this software you must label
+ * your software as modified software and not distribute it in such a
+ * fashion that it might be confused with the original M.I.T. software.  
+ */
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 1998-2008 The OpenLDAP Foundation.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted only as authorized by the OpenLDAP
+ * Public License.
+ *
+ * A copy of this license is available in file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * <http://www.OpenLDAP.org/license.html>.
+ */
+/* This notice applies to changes, created by or for Novell, Inc.,
+ * to preexisting works for which notices appear elsewhere in this file.
+ *
+ * Copyright (C) 2000 Novell, Inc. All Rights Reserved.
+ *
+ * THIS WORK IS SUBJECT TO U.S. AND INTERNATIONAL COPYRIGHT LAWS AND TREATIES.
+ * USE, MODIFICATION, AND REDISTRIBUTION OF THIS WORK IS SUBJECT TO VERSION
+ * 2.0.1 OF THE OPENLDAP PUBLIC LICENSE, A COPY OF WHICH IS AVAILABLE AT
+ * HTTP://WWW.OPENLDAP.ORG/LICENSE.HTML OR IN THE FILE "LICENSE" IN THE
+ * TOP-LEVEL DIRECTORY OF THE DISTRIBUTION. ANY USE OR EXPLOITATION OF THIS
+ * WORK OTHER THAN AS AUTHORIZED IN VERSION 2.0.1 OF THE OPENLDAP PUBLIC
+ * LICENSE, OR OTHER PRIOR WRITTEN CONSENT FROM NOVELL, COULD SUBJECT THE
+ * PERPETRATOR TO CRIMINAL AND CIVIL LIABILITY.
+ */
+
+#ifndef K5_UTF8_H
+#define K5_UTF8_H
+
+#include "autoconf.h"
+
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+
+#ifdef HAVE_STDLIB_H
+#include <stdlib.h>
+#endif
+
+#if INT_MAX == 0x7fff
+typedef	int	krb5_ucs2;
+#elif SHRT_MAX == 0x7fff
+typedef	short	krb5_ucs2;
+#else
+#error undefined 16 bit type
+#endif
+
+#if INT_MAX == 0x7fffffffL
+typedef int	krb5_ucs4;
+#elif LONG_MAX == 0x7fffffffL
+typedef long	krb5_ucs4;
+#elif SHRT_MAX == 0x7fffffffL
+typedef short	krb5_ucs4;
+#else
+#error: undefined 32 bit type
+#endif
+
+#define KRB5_UCS2_INVALID   ((krb5_ucs2)0x8000)
+#define KRB5_UCS4_INVALID   ((krb5_ucs4)0x80000000)
+
+#define KRB5_MAX_UTF8_LEN   (sizeof(krb5_ucs2) * 3/2)
+
+krb5_ucs2 krb5int_utf8_to_ucs2(const char *p);
+size_t krb5int_ucs2_to_utf8(krb5_ucs2 c, char *buf);
+
+krb5_ucs4 krb5int_utf8_to_ucs4(const char *p);
+size_t krb5int_ucs4_to_utf8(krb5_ucs4 c, char *buf);
+
+int
+krb5int_ucs2s_to_utf8s(const krb5_ucs2 *ucs2s,
+		       char **utf8s,
+		       size_t *utf8slen);
+
+int
+krb5int_ucs2cs_to_utf8s(const krb5_ucs2 *ucs2s,
+			size_t ucs2slen,
+		        char **utf8s,
+		        size_t *utf8slen);
+
+int
+krb5int_ucs2les_to_utf8s(const unsigned char *ucs2les,
+			 char **utf8s,
+			 size_t *utf8slen);
+
+int
+krb5int_ucs2lecs_to_utf8s(const unsigned char *ucs2les,
+			  size_t ucs2leslen,
+			  char **utf8s,
+			  size_t *utf8slen);
+
+int
+krb5int_utf8s_to_ucs2s(const char *utf8s,
+		       krb5_ucs2 **ucs2s,
+		       size_t *ucs2chars);
+
+int
+krb5int_utf8cs_to_ucs2s(const char *utf8s,
+			size_t utf8slen,
+		        krb5_ucs2 **ucs2s,
+		        size_t *ucs2chars);
+
+int
+krb5int_utf8s_to_ucs2les(const char *utf8s,
+			 unsigned char **ucs2les,
+		         size_t *ucs2leslen);
+
+int
+krb5int_utf8cs_to_ucs2les(const char *utf8s,
+			  size_t utf8slen,
+		          unsigned char **ucs2les,
+			  size_t *ucs2leslen);
+
+/* returns the number of bytes in the UTF-8 string */
+size_t krb5int_utf8_bytes(const char *);
+/* returns the number of UTF-8 characters in the string */
+size_t krb5int_utf8_chars(const char *);
+/* returns the number of UTF-8 characters in the counted string */
+size_t krb5int_utf8c_chars(const char *, size_t);
+/* returns the length (in bytes) of the UTF-8 character */
+int krb5int_utf8_offset(const char *);
+/* returns the length (in bytes) indicated by the UTF-8 character */
+int krb5int_utf8_charlen(const char *);
+
+/* returns the length (in bytes) indicated by the UTF-8 character
+ * also checks that shortest possible encoding was used
+ */
+int krb5int_utf8_charlen2(const char *);
+
+/* copies a UTF-8 character and returning number of bytes copied */
+int krb5int_utf8_copy(char *, const char *);
+
+/* returns pointer of next UTF-8 character in string */
+char *krb5int_utf8_next( const char *);
+/* returns pointer of previous UTF-8 character in string */
+char *krb5int_utf8_prev( const char *);
+
+/* primitive ctype routines -- not aware of non-ascii characters */
+int krb5int_utf8_isascii( const char *);
+int krb5int_utf8_isalpha( const char *);
+int krb5int_utf8_isalnum( const char *);
+int krb5int_utf8_isdigit( const char *);
+int krb5int_utf8_isxdigit( const char *);
+int krb5int_utf8_isspace( const char *);
+
+/* span characters not in set, return bytes spanned */
+size_t krb5int_utf8_strcspn( const char* str, const char *set);
+/* span characters in set, return bytes spanned */
+size_t krb5int_utf8_strspn( const char* str, const char *set);
+/* return first occurance of character in string */
+char *krb5int_utf8_strchr( const char* str, const char *chr);
+/* return first character of set in string */
+char *krb5int_utf8_strpbrk( const char* str, const char *set);
+/* reentrant tokenizer */
+char *krb5int_utf8_strtok( char* sp, const char* sep, char **last);
+
+/* Optimizations */
+extern const char krb5int_utf8_lentab[128];
+extern const char krb5int_utf8_mintab[32];
+
+#define KRB5_UTF8_ISASCII(p) ( !(*(const unsigned char *)(p) & 0x80 ) )
+#define KRB5_UTF8_CHARLEN(p) ( KRB5_UTF8_ISASCII(p) \
+	? 1 : krb5int_utf8_lentab[*(const unsigned char *)(p) ^ 0x80] )
+
+/* This is like CHARLEN but additionally validates to make sure
+ * the char used the shortest possible encoding.
+ * 'l' is used to temporarily hold the result of CHARLEN.
+ */
+#define KRB5_UTF8_CHARLEN2(p, l) ( ( ( l = KRB5_UTF8_CHARLEN( p )) < 3 || \
+	( krb5int_utf8_mintab[*(const unsigned char *)(p) & 0x1f] & (p)[1] ) ) ? \
+	l : 0 )
+
+#define KRB5_UTF8_OFFSET(p) ( KRB5_UTF8_ISASCII(p) \
+	? 1 : krb5int_utf8_offset((p)) )
+
+#define KRB5_UTF8_COPY(d,s) ( KRB5_UTF8_ISASCII(s) \
+	? (*(d) = *(s), 1) : krb5int_utf8_copy((d),(s)) )
+
+#define KRB5_UTF8_NEXT(p) (	KRB5_UTF8_ISASCII(p) \
+	? (char *)(p)+1 : krb5int_utf8_next((p)) )
+
+#define KRB5_UTF8_INCR(p) ((p) = KRB5_UTF8_NEXT(p))
+
+/* For symmetry */
+#define KRB5_UTF8_PREV(p) (krb5int_utf8_prev((p)))
+#define KRB5_UTF8_DECR(p) ((p)=KRB5_UTF8_PREV((p)))
+
+/*
+ * these macros assume 'x' is an ASCII x
+ * and assume the "C" locale
+ */
+#define KRB5_ASCII(c)		(!((c) & 0x80))
+#define KRB5_SPACE(c)		((c) == ' ' || (c) == '\t' || (c) == '\n')
+#define KRB5_DIGIT(c)		((c) >= '0' && (c) <= '9')
+#define KRB5_LOWER(c)		((c) >= 'a' && (c) <= 'z')
+#define KRB5_UPPER(c)		((c) >= 'A' && (c) <= 'Z')
+#define KRB5_ALPHA(c)		(KRB5_LOWER(c) || KRB5_UPPER(c))
+#define KRB5_ALNUM(c)		(KRB5_ALPHA(c) || KRB5_DIGIT(c))
+
+#define KRB5_LDH(c)		(KRB5_ALNUM(c) || (c) == '-')
+
+#define KRB5_HEXLOWER(c)	((c) >= 'a' && (c) <= 'f')
+#define KRB5_HEXUPPER(c)	((c) >= 'A' && (c) <= 'F')
+#define KRB5_HEX(c)		(KRB5_DIGIT(c) || \
+				KRB5_HEXLOWER(c) || KRB5_HEXUPPER(c))
+
+#endif /* K5_UTF8_H */
diff --git a/src/include/kdb.h b/src/include/kdb.h
index cc5951d46..a3142c1d7 100644
--- a/src/include/kdb.h
+++ b/src/include/kdb.h
@@ -85,6 +85,8 @@
 #define KRB5_KDB_CREATE_BTREE		0x00000001
 #define KRB5_KDB_CREATE_HASH		0x00000002
 
+#if !defined(_WIN32)
+
 /*
  * Note --- these structures cannot be modified without changing the
  * database version number in libkdb.a, but should be expandable by
@@ -194,6 +196,7 @@ extern char *krb5_mkey_pwd_prompt2;
  *
  * Data encoding is little-endian.
  */
+#ifdef _KRB5_INT_H
 #include "k5-platform.h"
 #define	krb5_kdb_decode_int16(cp, i16)	\
 	*((krb5_int16 *) &(i16)) = load_16_le(cp)
@@ -201,6 +204,7 @@ extern char *krb5_mkey_pwd_prompt2;
 	*((krb5_int32 *) &(i32)) = load_32_le(cp)
 #define krb5_kdb_encode_int16(i16, cp)	store_16_le(i16, cp)
 #define	krb5_kdb_encode_int32(i32, cp)	store_32_le(i32, cp)
+#endif /* _KRB5_INT_H */
 
 #define KRB5_KDB_OPEN_RW                0
 #define KRB5_KDB_OPEN_RO                1
@@ -473,6 +477,36 @@ krb5_dbe_def_cpw( krb5_context	  context,
 krb5_error_code
 krb5_def_promote_db(krb5_context, char *, char **);
 
+krb5_error_code
+krb5_dbekd_def_decrypt_key_data( krb5_context		  context,
+				 const krb5_keyblock	* mkey,
+				 const krb5_key_data	* key_data,
+				 krb5_keyblock		* dbkey,
+				 krb5_keysalt		* keysalt);
+
+krb5_error_code
+krb5_dbekd_def_encrypt_key_data( krb5_context		  context,
+				 const krb5_keyblock	* mkey,
+				 const krb5_keyblock	* dbkey,
+				 const krb5_keysalt	* keysalt,
+				 int			  keyver,
+				 krb5_key_data		* key_data);
+
+krb5_error_code
+krb5_dbekd_def_decrypt_key_data( krb5_context 	  context,
+				 const krb5_keyblock	* mkey,
+				 const krb5_key_data	* key_data,
+				 krb5_keyblock 	* dbkey,
+				 krb5_keysalt 	* keysalt);
+
+krb5_error_code
+krb5_dbekd_def_encrypt_key_data( krb5_context 		  context,
+				 const krb5_keyblock	* mkey,
+				 const krb5_keyblock 	* dbkey,
+				 const krb5_keysalt	* keysalt,
+				 int			  keyver,
+				 krb5_key_data	        * key_data);
+
 krb5_error_code 
 krb5_db_create_policy( krb5_context kcontext, 
 		       osa_policy_ent_t policy);
@@ -501,6 +535,208 @@ void
 krb5_db_free_policy( krb5_context kcontext, 
 		     osa_policy_ent_t policy);
 
+
+
+krb5_error_code
+krb5_db_set_context
+	(krb5_context, void *db_context);
+
+krb5_error_code
+krb5_db_get_context
+	(krb5_context, void **db_context);
+
 #define KRB5_KDB_DEF_FLAGS	0
 
+#define KDB_MAX_DB_NAME			128
+#define KDB_REALM_SECTION		"realms"
+#define KDB_MODULE_POINTER		"database_module"
+#define KDB_MODULE_DEF_SECTION		"dbdefaults"
+#define KDB_MODULE_SECTION		"dbmodules"
+#define KDB_LIB_POINTER			"db_library"
+#define KDB_DATABASE_CONF_FILE		DEFAULT_SECURE_PROFILE_PATH
+#define KDB_DATABASE_ENV_PROF		KDC_PROFILE_ENV
+
+#define KRB5_KDB_OPEN_RW		0
+#define KRB5_KDB_OPEN_RO		1
+
+#define KRB5_KDB_OPT_SET_DB_NAME	0
+#define KRB5_KDB_OPT_SET_LOCK_MODE	1
+
+typedef struct _kdb_vftabl {
+    short int maj_ver;
+    short int min_ver;
+
+    krb5_error_code (*init_library)();
+    krb5_error_code (*fini_library)();
+    krb5_error_code (*init_module) ( krb5_context kcontext,
+				     char * conf_section,
+				     char ** db_args,
+				     int mode );
+
+    krb5_error_code (*fini_module) ( krb5_context kcontext );
+
+    krb5_error_code (*db_create) ( krb5_context kcontext,
+				   char * conf_section,
+				   char ** db_args );
+
+    krb5_error_code (*db_destroy) ( krb5_context kcontext,
+				    char *conf_section,
+				    char ** db_args );
+
+    krb5_error_code (*db_get_age) ( krb5_context kcontext, 
+				    char *db_name, 
+				    time_t *age );
+
+    krb5_error_code (*db_set_option) ( krb5_context kcontext,
+				       int option,
+				       void *value );
+
+    krb5_error_code (*db_lock) ( krb5_context kcontext,
+				 int mode );
+
+    krb5_error_code (*db_unlock) ( krb5_context kcontext);
+
+    krb5_error_code (*db_get_principal) ( krb5_context kcontext,
+					  krb5_const_principal search_for,
+					  unsigned int flags,
+					  krb5_db_entry *entries,
+					  int *nentries,
+					  krb5_boolean *more );
+
+    krb5_error_code (*db_free_principal) ( krb5_context kcontext,
+					   krb5_db_entry *entry,
+					   int count );
+
+    krb5_error_code (*db_put_principal) ( krb5_context kcontext,
+					  krb5_db_entry *entries,
+					  int *nentries,
+					  char **db_args);
+
+    krb5_error_code (*db_delete_principal) ( krb5_context kcontext,
+					     krb5_const_principal search_for,
+					     int *nentries );
+
+    krb5_error_code (*db_iterate) ( krb5_context kcontext,
+				    char *match_entry,
+				    int (*func) (krb5_pointer, krb5_db_entry *),
+				    krb5_pointer func_arg );
+
+    krb5_error_code (*db_create_policy) ( krb5_context kcontext,
+					  osa_policy_ent_t policy );
+
+    krb5_error_code (*db_get_policy) ( krb5_context kcontext,
+				       char *name,
+				       osa_policy_ent_t *policy,
+				       int *cnt);
+
+    krb5_error_code (*db_put_policy) ( krb5_context kcontext,
+				       osa_policy_ent_t policy );
+
+    krb5_error_code (*db_iter_policy) ( krb5_context kcontext,
+					char *match_entry,
+					osa_adb_iter_policy_func func,
+					void *data );
+
+
+    krb5_error_code (*db_delete_policy) ( krb5_context kcontext,
+					  char *policy );
+
+    void (*db_free_policy) ( krb5_context kcontext,
+			     osa_policy_ent_t val );
+
+    krb5_error_code (*db_supported_realms) ( krb5_context kcontext,
+					    char **realms );
+
+    krb5_error_code (*db_free_supported_realms) ( krb5_context kcontext,
+						  char **realms );
+
+
+    const char * (*errcode_2_string) ( krb5_context kcontext,
+				       long err_code );
+
+    void (*release_errcode_string) (krb5_context kcontext, const char *msg);
+
+    void * (*db_alloc) (krb5_context kcontext, void *ptr, size_t size);
+    void   (*db_free)  (krb5_context kcontext, void *ptr);
+
+
+
+    /* optional functions */
+    krb5_error_code (*set_master_key)    ( krb5_context kcontext, 
+					   char *pwd, 
+					   krb5_keyblock *key);
+
+    krb5_error_code (*get_master_key)    ( krb5_context kcontext,
+					   krb5_keyblock **key);
+
+
+    krb5_error_code (*setup_master_key_name) ( krb5_context kcontext,
+					       char *keyname,
+					       char *realm, 
+					       char **fullname, 
+					       krb5_principal  *principal);
+
+    krb5_error_code (*store_master_key)  ( krb5_context kcontext, 
+					   char *db_arg, 
+					   krb5_principal mname,
+					   krb5_kvno kvno,
+					   krb5_keyblock *key,
+					   char *master_pwd);
+
+    krb5_error_code (*fetch_master_key)  ( krb5_context kcontext,
+					   krb5_principal mname,
+					   krb5_keyblock *key,
+					   krb5_kvno *kvno,
+					   char *db_args);
+
+    krb5_error_code (*verify_master_key) ( krb5_context kcontext,
+					   krb5_principal mprinc,
+					   krb5_kvno kvno,
+					   krb5_keyblock *mkey );
+
+    krb5_error_code (*dbe_search_enctype) ( krb5_context kcontext, 
+					    krb5_db_entry *dbentp, 
+					    krb5_int32 *start, 
+					    krb5_int32 ktype, 
+					    krb5_int32 stype, 
+					    krb5_int32 kvno, 
+					    krb5_key_data **kdatap);
+    
+
+    krb5_error_code
+    (*db_change_pwd) ( krb5_context	  context,
+		       krb5_keyblock       * master_key,
+		       krb5_key_salt_tuple	* ks_tuple,
+		       int			  ks_tuple_count,
+		       char 		* passwd,
+		       int			  new_kvno,
+		       krb5_boolean	  keepold,
+		       krb5_db_entry	* db_entry);
+
+    /* Promote a temporary database to be the live one.  */
+    krb5_error_code (*promote_db) (krb5_context context,
+				   char *conf_section,
+				   char **db_args);
+
+    krb5_error_code (*dbekd_decrypt_key_data) ( krb5_context kcontext,
+					        const krb5_keyblock *mkey,
+						const krb5_key_data *key_data,
+						krb5_keyblock *dbkey,
+						krb5_keysalt *keysalt );
+
+    krb5_error_code (*dbekd_encrypt_key_data) ( krb5_context kcontext,
+						const krb5_keyblock *mkey,
+						const krb5_keyblock *dbkey,
+						const krb5_keysalt *keyselt,
+						int keyver,
+						krb5_key_data *key_data );
+
+    krb5_error_code
+    (*db_invoke) ( krb5_context context,
+		   unsigned int method,
+		   const krb5_data *req,
+		   krb5_data *rep );
+} kdb_vftabl;
+#endif /* !defined(_WIN32) */
+
 #endif /* KRB5_KDB5__ */
diff --git a/src/include/kdb_ext.h b/src/include/kdb_ext.h
new file mode 100644
index 000000000..5ee234657
--- /dev/null
+++ b/src/include/kdb_ext.h
@@ -0,0 +1,169 @@
+/*
+ * include/krb5/kdb_ext.h
+ *
+ * Copyright (c) 2006-2008, Novell, Inc.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ *   * Redistributions of source code must retain the above copyright notice,
+ *       this list of conditions and the following disclaimer.
+ *   * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *   * The copyright holder's name is not used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef KRB5_KDB5_EXT__
+#define KRB5_KDB5_EXT__
+
+/* Can be delegated as in TicketFlags */
+#define KRB5_KDB_OK_AS_DELEGATE		0x00100000
+/* Allowed to use protocol transition */
+#define KRB5_KDB_OK_TO_AUTH_AS_DELEGATE	0x00200000
+/* Service does not require authorization data */
+#define KRB5_KDB_NO_AUTH_DATA_REQUIRED	0x00400000
+/* Used to indicate non-Windows client behaviour */
+#define KRB5_KDB_NON_MS_PRINCIPAL	0x00800000
+/* Private flag used to indicate principal is local TGS */
+#define KRB5_KDB_TICKET_GRANTING_SERVICE	0x01000000
+/* Private flag used to indicate trust is non-transitive */
+#define KRB5_KDB_TRUST_NON_TRANSITIVE		0x02000000
+
+/* Entry get flags */
+/* Name canonicalization requested */
+#define KRB5_KDB_FLAG_CANONICALIZE		0x00000010
+/* Include authorization data generated by backend */
+#define KRB5_KDB_FLAG_INCLUDE_PAC		0x00000020
+/* Is AS-REQ (client referrals only) */
+#define KRB5_KDB_FLAG_CLIENT_REFERRALS_ONLY	0x00000040
+/* Map cross-realm principals */
+#define KRB5_KDB_FLAG_MAP_PRINCIPALS		0x00000080
+/* Protocol transition */
+#define KRB5_KDB_FLAG_PROTOCOL_TRANSITION	0x00000100
+/* Constrained delegation */
+#define KRB5_KDB_FLAG_CONSTRAINED_DELEGATION	0x00000200
+/* PKINIT */
+#define KRB5_KDB_FLAG_PKINIT			0x00000400
+/* User-to-user */
+#define KRB5_KDB_FLAG_USER_TO_USER		0x00000800
+/* Cross-realm */
+#define KRB5_KDB_FLAG_CROSS_REALM		0x00001000
+
+#define KRB5_KDB_FLAGS_S4U			( KRB5_KDB_FLAG_PROTOCOL_TRANSITION | \
+						  KRB5_KDB_FLAG_CONSTRAINED_DELEGATION )
+
+#define KRB5_TL_PAC_LOGON_INFO		0x0100 /* NDR encoded validation info */
+#define KRB5_TL_SERVER_REFERRAL		0x0200 /* ASN.1 encoded ServerReferralInfo */
+#define KRB5_TL_SVR_REFERRAL_DATA	0x0300 /* ASN.1 encoded PA-SVR-REFERRAL-DATA */
+#define KRB5_TL_CONSTRAINED_DELEGATION_ACL 0x0400 /* Each entry is a permitted SPN */
+#define KRB5_TL_LM_KEY			0x0500 /* LM OWF */
+#define KRB5_TL_X509_SUBJECT_ISSUER_NAME 0x0600 /* <I>IssuerDN<S>SubjectDN */
+
+krb5_error_code krb5_db_get_principal_ext ( krb5_context kcontext,
+					    krb5_const_principal search_for,
+					    unsigned int flags,
+					    krb5_db_entry *entries,
+					    int *nentries,
+					    krb5_boolean *more );
+
+krb5_error_code krb5_db_invoke ( krb5_context kcontext,
+				 unsigned int method,
+				 const krb5_data *req,
+				 krb5_data *rep );
+
+/* db_invoke methods */
+#define KRB5_KDB_METHOD_SIGN_AUTH_DATA			0x00000010
+#define KRB5_KDB_METHOD_CHECK_TRANSITED_REALMS		0x00000020
+#define KRB5_KDB_METHOD_CHECK_POLICY_AS			0x00000030
+#define KRB5_KDB_METHOD_CHECK_POLICY_TGS		0x00000040
+#define KRB5_KDB_METHOD_AUDIT_AS			0x00000050
+#define KRB5_KDB_METHOD_AUDIT_TGS			0x00000060
+#define KRB5_KDB_METHOD_REFRESH_POLICY			0x00000070
+#define KRB5_KDB_METHOD_GET_PAC_PRINC			0x00000080
+
+typedef struct _kdb_sign_auth_data_req {
+    krb5_magic magic;
+    unsigned int flags;			/* KRB5_KDB flags */
+    krb5_const_principal client_princ;	/* Client name used in ticket */
+    krb5_db_entry *client;		/* DB entry for client principal */
+    krb5_db_entry *server;		/* DB entry for server principal */
+    krb5_db_entry *krbtgt;		/* DB entry for ticket granting service principal */
+    krb5_keyblock *client_key;		/* Reply key, valid for AS-REQ only */
+    krb5_keyblock *server_key;		/* Key used to generate server signature */
+    krb5_timestamp authtime;		/* Authtime of TGT */
+    krb5_authdata **auth_data;		/* Authorization data from TGT */
+} kdb_sign_auth_data_req;
+
+typedef struct _kdb_sign_auth_data_rep {
+    krb5_magic magic;
+    krb5_authdata **auth_data;		/* Signed authorization data */
+    krb5_db_entry *entry;		/* Optional client principal extracted from auth data */
+    int nprincs;			/* Non-zero if above contains principal data */
+} kdb_sign_auth_data_rep;
+
+typedef struct _kdb_check_transited_realms_req {
+    krb5_magic magic;
+    const krb5_data *tr_contents;
+    const krb5_data *client_realm;
+    const krb5_data *server_realm;
+} kdb_check_transited_realms_req;
+
+typedef struct _kdb_check_policy_as_req {
+    krb5_magic magic;
+    krb5_kdc_req *request;
+    krb5_db_entry *client;
+    krb5_db_entry *server;
+    krb5_timestamp kdc_time;
+} kdb_check_policy_as_req;
+
+typedef struct _kdb_check_policy_as_rep {
+    krb5_magic magic;
+    const char *status;
+} kdb_check_policy_as_rep;
+
+typedef struct _kdb_check_policy_tgs_req {
+    krb5_magic magic;
+    krb5_kdc_req *request;
+    krb5_db_entry *server;
+    krb5_ticket *ticket;
+} kdb_check_policy_tgs_req;
+
+typedef struct _kdb_check_policy_tgs_rep {
+    krb5_magic magic;
+    const char *status;
+} kdb_check_policy_tgs_rep;
+
+typedef struct _kdb_audit_as_req {
+    krb5_magic magic;
+    krb5_kdc_req *request;
+    krb5_db_entry *client;
+    krb5_db_entry *server;
+    krb5_timestamp authtime;
+    krb5_error_code error_code;
+} kdb_audit_as_req;
+
+typedef struct _kdb_audit_tgs_req {
+    krb5_magic magic;
+    krb5_kdc_req *request;
+    krb5_const_principal client;
+    krb5_db_entry *server;
+    krb5_timestamp authtime;
+    krb5_error_code error_code;
+} kdb_audit_tgs_req;
+
+#endif /* KRB5_KDB5_EXT__ */
diff --git a/src/include/krb5/authdata_plugin.h b/src/include/krb5/authdata_plugin.h
index b2e33f3c4..e8c9fce2d 100644
--- a/src/include/krb5/authdata_plugin.h
+++ b/src/include/krb5/authdata_plugin.h
@@ -108,4 +108,53 @@ typedef struct krb5plugin_authdata_ftable_v0 {
 				     krb5_kdc_req *request,
 				     krb5_enc_tkt_part *enc_tkt_reply);
 } krb5plugin_authdata_ftable_v0;
+
+typedef struct krb5plugin_authdata_ftable_v1 {
+    /* Not-usually-visible name. */
+    char *name;
+
+    /*
+     * Per-plugin initialization/cleanup.  The init function is called
+     * by the KDC when the plugin is loaded, and the fini function is
+     * called before the plugin is unloaded.  Both are optional.
+     */
+    krb5_error_code (*init_proc)(krb5_context, void **);
+    void (*fini_proc)(krb5_context, void *);
+    /*
+     * Actual authorization data handling function.  If this field
+     * holds a null pointer, this mechanism will be skipped, and the
+     * init/fini functions will not be run.
+     *
+     * This function should only modify the field
+     * enc_tkt_reply->authorization_data.  All other values should be
+     * considered inputs only.  And, it should *modify* the field, not
+     * overwrite it and assume that there are no other authdata
+     * plugins in use.
+     *
+     * Memory management: authorization_data is a malloc-allocated,
+     * null-terminated sequence of malloc-allocated pointers to
+     * authorization data structures.  This plugin code currently
+     * assumes the libraries, KDC, and plugin all use the same malloc
+     * pool, which may be a problem if/when we get the KDC code
+     * running on Windows.
+     *
+     * If this function returns a non-zero error code, a message
+     * is logged, but no other action is taken.  Other authdata
+     * plugins will be called, and a response will be sent to the
+     * client (barring other problems).
+     */
+    krb5_error_code (*authdata_proc)(krb5_context,
+				     unsigned int flags,
+				     struct _krb5_db_entry_new *client,
+				     struct _krb5_db_entry_new *server,
+				     struct _krb5_db_entry_new *tgs,
+				     krb5_keyblock *client_key,
+				     krb5_keyblock *server_key,
+				     krb5_data *req_pkt,
+				     krb5_kdc_req *request,
+				     krb5_const_principal for_user_princ,
+				     krb5_enc_tkt_part *enc_tkt_request,
+				     krb5_enc_tkt_part *enc_tkt_reply);
+} krb5plugin_authdata_ftable_v1;
+
 #endif /* KRB5_AUTHDATA_PLUGIN_H_INCLUDED */
diff --git a/src/include/krb5/krb5.hin b/src/include/krb5/krb5.hin
index accde60fc..c0fdcd2d8 100644
--- a/src/include/krb5/krb5.hin
+++ b/src/include/krb5/krb5.hin
@@ -244,17 +244,29 @@ typedef	krb5_principal_data * krb5_principal;
  */
 
 /* Name type not known */
-#define KRB5_NT_UNKNOWN		0
+#define KRB5_NT_UNKNOWN			0
 /* Just the name of the principal as in DCE, or for users */
-#define KRB5_NT_PRINCIPAL	1
+#define KRB5_NT_PRINCIPAL		1
 /* Service and other unique instance (krbtgt) */
-#define KRB5_NT_SRV_INST	2
+#define KRB5_NT_SRV_INST		2
 /* Service with host name as instance (telnet, rcommands) */
-#define KRB5_NT_SRV_HST		3
+#define KRB5_NT_SRV_HST			3
 /* Service with host as remaining components */
-#define KRB5_NT_SRV_XHST	4
+#define KRB5_NT_SRV_XHST		4
 /* Unique ID */
-#define KRB5_NT_UID		5
+#define KRB5_NT_UID			5
+/* PKINIT */
+#define KRB5_NT_X500_PRINCIPAL		6
+/* Name in form of SMTP email name */
+#define KRB5_NT_SMTP_NAME		7
+/* Windows 2000 UPN */
+#define KRB5_NT_ENTERPRISE_PRINCIPAL	10
+/* Windows 2000 UPN and SID */
+#define KRB5_NT_MS_PRINCIPAL		-128
+/* NT 4 style name */
+#define KRB5_NT_MS_PRINCIPAL_AND_ID	-129
+/* NT 4 style name and SID */
+#define KRB5_NT_ENT_PRINCIPAL_AND_ID	-130
 
 /* constant version thereof: */
 typedef const krb5_principal_data *krb5_const_principal;
@@ -303,6 +315,7 @@ typedef struct _krb5_address {
 #define	ADDRTYPE_XNS		0x0006
 #define	ADDRTYPE_ISO		0x0007
 #define ADDRTYPE_DDP		0x0010
+#define ADDRTYPE_NETBIOS	0x0014
 #define ADDRTYPE_INET6		0x0018
 /* not yet in the spec... */
 #define ADDRTYPE_ADDRPORT	0x0100
@@ -402,6 +415,7 @@ typedef struct _krb5_crypto_iov {
 #define CKSUMTYPE_HMAC_SHA1_DES3	0x000c
 #define CKSUMTYPE_HMAC_SHA1_96_AES128	0x000f
 #define CKSUMTYPE_HMAC_SHA1_96_AES256	0x0010
+#define CKSUMTYPE_MD5_HMAC_ARCFOUR -137 /*Microsoft netlogon cksumtype*/
 #define CKSUMTYPE_HMAC_MD5_ARCFOUR -138 /*Microsoft md5 hmac cksumtype*/
 
 /* The following are entropy source designations. Whenever
@@ -763,6 +777,7 @@ krb5_error_code KRB5_CALLCONV krb5_verify_checksum
 /* #define	KDC_OPT_RESERVED	0x00080000 */
 /* #define	KDC_OPT_RESERVED	0x00040000 */
 #define	KDC_OPT_REQUEST_ANONYMOUS	0x00020000
+#define KDC_OPT_CNAME_IN_ADDL_TKT	0x00020000
 #define	KDC_OPT_CANONICALIZE		0x00010000
 /* #define	KDC_OPT_RESERVED	0x00008000 */
 /* #define	KDC_OPT_RESERVED	0x00004000 */
@@ -823,10 +838,10 @@ krb5_error_code KRB5_CALLCONV krb5_verify_checksum
 /* #define	AP_OPTS_RESERVED	0x00000010 */
 /* #define	AP_OPTS_RESERVED	0x00000008 */
 /* #define	AP_OPTS_RESERVED	0x00000004 */
-/* #define	AP_OPTS_RESERVED	0x00000002 */
-#define AP_OPTS_USE_SUBKEY	0x00000001
+#define	AP_OPTS_ETYPE_NEGOTIATION	0x00000002
+#define AP_OPTS_USE_SUBKEY		0x00000001
 
-#define AP_OPTS_WIRE_MASK	0xfffffff0
+#define AP_OPTS_WIRE_MASK		0xfffffff0
 
 /* definitions for ad_type fields. */
 #define	AD_TYPE_RESERVED	0x8000
@@ -876,13 +891,6 @@ krb5_error_code KRB5_CALLCONV krb5_verify_checksum
 
 #define LR_TYPE_INTERPRETATION_MASK	0x7fff
 
-/* definitions for ad_type fields. */
-#define	AD_TYPE_EXTERNAL	0x4000
-#define	AD_TYPE_REGISTERED	0x2000
-
-#define AD_TYPE_FIELD_TYPE_MASK	0x1fff
-#define AD_TYPE_INTERNAL_MASK	0x3fff
-
 /* definitions for msec direction bit for KRB_SAFE, KRB_PRIV */
 #define	MSEC_DIRBIT		0x8000
 #define	MSEC_VAL_MASK		0x7fff
@@ -950,12 +958,15 @@ krb5_error_code KRB5_CALLCONV krb5_verify_checksum
 #define KRB5_PADATA_PK_AS_REP		17 /* PKINIT */
 #define KRB5_PADATA_ETYPE_INFO2		19
 #define KRB5_PADATA_USE_SPECIFIED_KVNO	20
+#define KRB5_PADATA_SVR_REFERRAL_INFO	20 /* Windows 2000 referrals */
 #define KRB5_PADATA_SAM_REDIRECT	21
 #define KRB5_PADATA_GET_FROM_TYPED_DATA	22
 #define KRB5_PADATA_REFERRAL		25 /* draft referral system */
 #define KRB5_PADATA_SAM_CHALLENGE_2	30 /* draft challenge system, updated */
 #define KRB5_PADATA_SAM_RESPONSE_2	31 /* draft challenge system, updated */
-    
+#define KRB5_PADATA_PAC_REQUEST		128 /* include Windows PAC */
+#define KRB5_PADATA_FOR_USER		129 /* username protocol transition request */
+#define KRB5_PADATA_S4U_X509_USER	130 /* certificate protocol transition request */
 #define	KRB5_SAM_USE_SAD_AS_KEY		0x80000000
 #define	KRB5_SAM_SEND_ENCRYPTED_SAD	0x40000000
 #define	KRB5_SAM_MUST_PK_ENCRYPT_SAD	0x20000000 /* currently must be zero */
@@ -977,6 +988,8 @@ krb5_error_code KRB5_CALLCONV krb5_verify_checksum
 #define KRB5_AUTHDATA_INITIAL_VERIFIED_CAS	9
 #define	KRB5_AUTHDATA_OSF_DCE	64
 #define KRB5_AUTHDATA_SESAME	65
+#define KRB5_AUTHDATA_WIN2K_PAC	128
+#define KRB5_AUTHDATA_ETYPE_NEGOTIATION	129	/* RFC 4537 */
 
 /* password change constants */
 
@@ -1129,6 +1142,7 @@ typedef struct _krb5_enc_kdc_rep_part {
     krb5_principal server;		/* server's principal identifier */
     krb5_address **caddrs;	/* array of ptrs to addresses,
 					   optional */
+    krb5_pa_data **enc_padata;		/* Windows 2000 compat */
 } krb5_enc_kdc_rep_part;
 
 typedef struct _krb5_kdc_rep {
@@ -1230,6 +1244,27 @@ typedef struct _krb5_pwd_data {
 } krb5_pwd_data;
 
 /* these need to be here so the typedefs are available for the prototypes */
+/*
+ * Note for Windows 2000 compatibility this is encoded
+ * in the enc_padata field of the krb5_enc_kdc_rep_part.
+ */
+typedef struct _krb5_pa_svr_referral_data {
+    /* Referred name, only realm is required */
+    krb5_principal     principal;
+} krb5_pa_svr_referral_data;
+
+typedef struct _krb5_pa_server_referral_data {
+    krb5_data          *referred_realm;
+    krb5_principal     true_principal_name;
+    krb5_principal     requested_principal_name;
+    krb5_timestamp     referral_valid_until;
+    krb5_checksum      rep_cksum;
+} krb5_pa_server_referral_data;
+
+typedef struct _krb5_pa_pac_req {
+    /* TRUE if a PAC should be included in TGS-REP */
+    krb5_boolean       include_pac;
+} krb5_pa_pac_req;
 
 /*
  * begin "safepriv.h"
@@ -1495,6 +1530,7 @@ void KRB5_CALLCONV krb5_free_tgt_creds
 
 #define	KRB5_GC_USER_USER	1	/* want user-user ticket */
 #define	KRB5_GC_CACHED		2	/* want cached ticket only */
+#define	KRB5_GC_CANONICALIZE	4	/* set canonicalize KDC option */
 
 krb5_error_code KRB5_CALLCONV krb5_get_credentials
 	(krb5_context,
@@ -1534,11 +1570,20 @@ krb5_error_code KRB5_CALLCONV krb5_mk_rep
 	(krb5_context,
 		krb5_auth_context,
 		krb5_data *);
+krb5_error_code KRB5_CALLCONV krb5_mk_rep_dce
+	(krb5_context,
+		krb5_auth_context,
+		krb5_data *);
 krb5_error_code KRB5_CALLCONV krb5_rd_rep
 	(krb5_context,
 		krb5_auth_context,
 		const krb5_data *,
 		krb5_ap_rep_enc_part **);
+krb5_error_code KRB5_CALLCONV krb5_rd_rep_dce
+	(krb5_context,
+		krb5_auth_context,
+		const krb5_data *,
+		krb5_ui_4 *);
 krb5_error_code KRB5_CALLCONV krb5_mk_error
 	(krb5_context,
 		const krb5_error *,
@@ -1563,6 +1608,14 @@ krb5_error_code KRB5_CALLCONV krb5_parse_name
 	(krb5_context,
 		const char *,
 		krb5_principal * );
+#define KRB5_PRINCIPAL_PARSE_NO_REALM		0x1
+#define KRB5_PRINCIPAL_PARSE_REQUIRE_REALM	0x2
+#define KRB5_PRINCIPAL_PARSE_ENTERPRISE		0x4
+krb5_error_code KRB5_CALLCONV krb5_parse_name_flags
+	(krb5_context,
+		const char *,
+		int,
+		krb5_principal * );
 krb5_error_code KRB5_CALLCONV krb5_unparse_name
 	(krb5_context,
 		krb5_const_principal,
@@ -1572,6 +1625,20 @@ krb5_error_code KRB5_CALLCONV krb5_unparse_name_ext
 		krb5_const_principal,
 		char **,
 		unsigned int *);
+#define KRB5_PRINCIPAL_UNPARSE_SHORT		0x1
+#define KRB5_PRINCIPAL_UNPARSE_NO_REALM		0x2
+#define KRB5_PRINCIPAL_UNPARSE_DISPLAY		0x4
+krb5_error_code KRB5_CALLCONV krb5_unparse_name_flags
+	(krb5_context,
+		krb5_const_principal,
+		int,
+		char **);
+krb5_error_code KRB5_CALLCONV krb5_unparse_name_flags_ext
+	(krb5_context,
+		krb5_const_principal,
+		int,
+		char **,
+		unsigned int *);
 
 krb5_error_code KRB5_CALLCONV krb5_set_principal_realm
 	(krb5_context, krb5_principal, const char *);
@@ -1596,6 +1663,20 @@ krb5_boolean KRB5_CALLCONV krb5_principal_compare
 	(krb5_context,
 		krb5_const_principal,
 		krb5_const_principal);
+krb5_boolean KRB5_CALLCONV krb5_principal_compare_any_realm
+	(krb5_context,
+		krb5_const_principal,
+		krb5_const_principal);
+#define KRB5_PRINCIPAL_COMPARE_IGNORE_REALM	    1
+#define KRB5_PRINCIPAL_COMPARE_ENTERPRISE	    2 /* compare UPNs as real principals */
+#define KRB5_PRINCIPAL_COMPARE_CASEFOLD		    4 /* case-insensitive comparison */
+#define KRB5_PRINCIPAL_COMPARE_UTF8		    8 /* treat principals as UTF-8 */
+
+krb5_boolean KRB5_CALLCONV krb5_principal_compare_flags
+	(krb5_context,
+		krb5_const_principal,
+		krb5_const_principal,
+		int);
 krb5_error_code KRB5_CALLCONV  krb5_init_keyblock
 		(krb5_context, krb5_enctype enctype,
 		size_t length, krb5_keyblock **out); 
@@ -2199,6 +2280,7 @@ typedef struct _krb5_get_init_creds_opt {
 #define KRB5_GET_INIT_CREDS_OPT_PREAUTH_LIST	0x0040
 #define KRB5_GET_INIT_CREDS_OPT_SALT		0x0080
 #define KRB5_GET_INIT_CREDS_OPT_CHG_PWD_PRMPT	0x0100
+#define KRB5_GET_INIT_CREDS_OPT_CANONICALIZE	0x0200
 
 
 krb5_error_code KRB5_CALLCONV
@@ -2236,6 +2318,11 @@ krb5_get_init_creds_opt_set_proxiable
 		int proxiable);
 
 void KRB5_CALLCONV
+krb5_get_init_creds_opt_set_canonicalize
+(krb5_get_init_creds_opt *opt,
+		int canonicalize);
+
+void KRB5_CALLCONV
 krb5_get_init_creds_opt_set_etype_list
 (krb5_get_init_creds_opt *opt,
 		krb5_enctype *etype_list,
@@ -2412,6 +2499,69 @@ krb5_free_error_message (krb5_context, const char *);
 void KRB5_CALLCONV
 krb5_clear_error_message (krb5_context);
 
+krb5_error_code KRB5_CALLCONV
+krb5_decode_authdata_container(krb5_context context,
+    krb5_authdatatype type,
+    const krb5_authdata *container,
+    krb5_authdata ***authdata);
+krb5_error_code KRB5_CALLCONV
+krb5_encode_authdata_container(krb5_context context,
+    krb5_authdatatype type,
+    krb5_authdata * const*authdata,
+    krb5_authdata ***container);
+
+/*
+ * Windows PAC
+ */
+struct krb5_pac_data;
+typedef struct krb5_pac_data *krb5_pac;
+
+krb5_error_code KRB5_CALLCONV
+krb5_pac_add_buffer
+(krb5_context context,
+		krb5_pac pac,
+		krb5_ui_4 type,
+		const krb5_data *data);
+
+void KRB5_CALLCONV
+krb5_pac_free
+(krb5_context context,
+		krb5_pac pac);
+
+krb5_error_code KRB5_CALLCONV
+krb5_pac_get_buffer
+(krb5_context context,
+		krb5_pac pac,
+		krb5_ui_4 type,
+		krb5_data *data);
+
+krb5_error_code KRB5_CALLCONV
+krb5_pac_get_types
+(krb5_context context,
+		krb5_pac pac,
+		size_t *len,
+		krb5_ui_4 **types);
+
+krb5_error_code KRB5_CALLCONV
+krb5_pac_init
+(krb5_context context,
+		krb5_pac *pac);
+
+krb5_error_code KRB5_CALLCONV
+krb5_pac_parse
+(krb5_context context,
+		const void *ptr,
+		size_t len,
+		krb5_pac *pac);
+
+krb5_error_code KRB5_CALLCONV
+krb5_pac_verify
+(krb5_context context,
+		const krb5_pac pac,
+		krb5_timestamp authtime,
+		krb5_const_principal principal,
+		const krb5_keyblock *server,
+		const krb5_keyblock *privsvr);
 
 #if TARGET_OS_MAC
 #    pragma pack(pop)
diff --git a/src/include/osconf.hin b/src/include/osconf.hin
index ef7c14d8e..6feb22338 100644
--- a/src/include/osconf.hin
+++ b/src/include/osconf.hin
@@ -126,4 +126,10 @@
 #define KPROPD_DEFAULT_KRB_DB DEFAULT_KDB_FILE
 #define KPROPD_ACL_FILE "@LOCALSTATEDIR/krb5kdc/kpropd.acl"
 
+/*
+ * GSS mechglue
+ */
+#define MECH_CONF "@SYSCONFDIR/gss/mech"
+#define MECH_LIB_PREFIX "@GSSMODULEDIR/"
+
 #endif /* KRB5_OSCONF__ */