r12000: Update to current lorikeet-heimdal, including in particular support

for referencing an existing in-MEMORY keytab (required for the new way
we push that to GSSAPI).

Andrew Bartlett
(This used to be commit 2426581dfb9f5f0f9367f846c01dfd3c30fea954)

4 files changed, 385 insertions, 13 deletions

diff --git a/source4/heimdal/lib/hdb/db.c b/source4/heimdal/lib/hdb/db.c
index b9f1ab47e1..4cc0218a5c 100644
--- a/source4/heimdal/lib/hdb/db.c
+++ b/source4/heimdal/lib/hdb/db.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997 - 2001 Kungliga Tekniska Högskolan
+ * Copyright (c) 1997 - 2001 Kungliga Tekniska Högskolan
  * (Royal Institute of Technology, Stockholm, Sweden). 
  * All rights reserved. 
  *
diff --git a/source4/heimdal/lib/hdb/hdb-protos.h b/source4/heimdal/lib/hdb/hdb-protos.h
index f7e0c54b7c..4b5b4d3ede 100644
--- a/source4/heimdal/lib/hdb/hdb-protos.h
+++ b/source4/heimdal/lib/hdb/hdb-protos.h
@@ -8,6 +8,317 @@
 extern "C" {
 #endif
 
+unsigned
+HDBFlags2int (HDBFlags /*f*/);
+
+int
+copy_Event (
+	const Event */*from*/,
+	Event */*to*/);
+
+int
+copy_GENERATION (
+	const GENERATION */*from*/,
+	GENERATION */*to*/);
+
+int
+copy_HDBFlags (
+	const HDBFlags */*from*/,
+	HDBFlags */*to*/);
+
+int
+copy_HDB_Ext_Aliases (
+	const HDB_Ext_Aliases */*from*/,
+	HDB_Ext_Aliases */*to*/);
+
+int
+copy_HDB_Ext_Constrained_delegation_acl (
+	const HDB_Ext_Constrained_delegation_acl */*from*/,
+	HDB_Ext_Constrained_delegation_acl */*to*/);
+
+int
+copy_HDB_Ext_Lan_Manager_OWF (
+	const HDB_Ext_Lan_Manager_OWF */*from*/,
+	HDB_Ext_Lan_Manager_OWF */*to*/);
+
+int
+copy_HDB_Ext_PKINIT_acl (
+	const HDB_Ext_PKINIT_acl */*from*/,
+	HDB_Ext_PKINIT_acl */*to*/);
+
+int
+copy_HDB_Ext_PKINIT_certificate (
+	const HDB_Ext_PKINIT_certificate */*from*/,
+	HDB_Ext_PKINIT_certificate */*to*/);
+
+int
+copy_HDB_Ext_Password (
+	const HDB_Ext_Password */*from*/,
+	HDB_Ext_Password */*to*/);
+
+int
+copy_HDB_extension (
+	const HDB_extension */*from*/,
+	HDB_extension */*to*/);
+
+int
+copy_HDB_extensions (
+	const HDB_extensions */*from*/,
+	HDB_extensions */*to*/);
+
+int
+copy_Key (
+	const Key */*from*/,
+	Key */*to*/);
+
+int
+copy_Salt (
+	const Salt */*from*/,
+	Salt */*to*/);
+
+int
+copy_hdb_entry (
+	const hdb_entry */*from*/,
+	hdb_entry */*to*/);
+
+int
+decode_Event (
+	const unsigned char */*p*/,
+	size_t /*len*/,
+	Event */*data*/,
+	size_t */*size*/);
+
+int
+decode_GENERATION (
+	const unsigned char */*p*/,
+	size_t /*len*/,
+	GENERATION */*data*/,
+	size_t */*size*/);
+
+int
+decode_HDBFlags (
+	const unsigned char */*p*/,
+	size_t /*len*/,
+	HDBFlags */*data*/,
+	size_t */*size*/);
+
+int
+decode_HDB_Ext_Aliases (
+	const unsigned char */*p*/,
+	size_t /*len*/,
+	HDB_Ext_Aliases */*data*/,
+	size_t */*size*/);
+
+int
+decode_HDB_Ext_Constrained_delegation_acl (
+	const unsigned char */*p*/,
+	size_t /*len*/,
+	HDB_Ext_Constrained_delegation_acl */*data*/,
+	size_t */*size*/);
+
+int
+decode_HDB_Ext_Lan_Manager_OWF (
+	const unsigned char */*p*/,
+	size_t /*len*/,
+	HDB_Ext_Lan_Manager_OWF */*data*/,
+	size_t */*size*/);
+
+int
+decode_HDB_Ext_PKINIT_acl (
+	const unsigned char */*p*/,
+	size_t /*len*/,
+	HDB_Ext_PKINIT_acl */*data*/,
+	size_t */*size*/);
+
+int
+decode_HDB_Ext_PKINIT_certificate (
+	const unsigned char */*p*/,
+	size_t /*len*/,
+	HDB_Ext_PKINIT_certificate */*data*/,
+	size_t */*size*/);
+
+int
+decode_HDB_Ext_Password (
+	const unsigned char */*p*/,
+	size_t /*len*/,
+	HDB_Ext_Password */*data*/,
+	size_t */*size*/);
+
+int
+decode_HDB_extension (
+	const unsigned char */*p*/,
+	size_t /*len*/,
+	HDB_extension */*data*/,
+	size_t */*size*/);
+
+int
+decode_HDB_extensions (
+	const unsigned char */*p*/,
+	size_t /*len*/,
+	HDB_extensions */*data*/,
+	size_t */*size*/);
+
+int
+decode_Key (
+	const unsigned char */*p*/,
+	size_t /*len*/,
+	Key */*data*/,
+	size_t */*size*/);
+
+int
+decode_Salt (
+	const unsigned char */*p*/,
+	size_t /*len*/,
+	Salt */*data*/,
+	size_t */*size*/);
+
+int
+decode_hdb_entry (
+	const unsigned char */*p*/,
+	size_t /*len*/,
+	hdb_entry */*data*/,
+	size_t */*size*/);
+
+int
+encode_Event (
+	unsigned char */*p*/,
+	size_t /*len*/,
+	const Event */*data*/,
+	size_t */*size*/);
+
+int
+encode_GENERATION (
+	unsigned char */*p*/,
+	size_t /*len*/,
+	const GENERATION */*data*/,
+	size_t */*size*/);
+
+int
+encode_HDBFlags (
+	unsigned char */*p*/,
+	size_t /*len*/,
+	const HDBFlags */*data*/,
+	size_t */*size*/);
+
+int
+encode_HDB_Ext_Aliases (
+	unsigned char */*p*/,
+	size_t /*len*/,
+	const HDB_Ext_Aliases */*data*/,
+	size_t */*size*/);
+
+int
+encode_HDB_Ext_Constrained_delegation_acl (
+	unsigned char */*p*/,
+	size_t /*len*/,
+	const HDB_Ext_Constrained_delegation_acl */*data*/,
+	size_t */*size*/);
+
+int
+encode_HDB_Ext_Lan_Manager_OWF (
+	unsigned char */*p*/,
+	size_t /*len*/,
+	const HDB_Ext_Lan_Manager_OWF */*data*/,
+	size_t */*size*/);
+
+int
+encode_HDB_Ext_PKINIT_acl (
+	unsigned char */*p*/,
+	size_t /*len*/,
+	const HDB_Ext_PKINIT_acl */*data*/,
+	size_t */*size*/);
+
+int
+encode_HDB_Ext_PKINIT_certificate (
+	unsigned char */*p*/,
+	size_t /*len*/,
+	const HDB_Ext_PKINIT_certificate */*data*/,
+	size_t */*size*/);
+
+int
+encode_HDB_Ext_Password (
+	unsigned char */*p*/,
+	size_t /*len*/,
+	const HDB_Ext_Password */*data*/,
+	size_t */*size*/);
+
+int
+encode_HDB_extension (
+	unsigned char */*p*/,
+	size_t /*len*/,
+	const HDB_extension */*data*/,
+	size_t */*size*/);
+
+int
+encode_HDB_extensions (
+	unsigned char */*p*/,
+	size_t /*len*/,
+	const HDB_extensions */*data*/,
+	size_t */*size*/);
+
+int
+encode_Key (
+	unsigned char */*p*/,
+	size_t /*len*/,
+	const Key */*data*/,
+	size_t */*size*/);
+
+int
+encode_Salt (
+	unsigned char */*p*/,
+	size_t /*len*/,
+	const Salt */*data*/,
+	size_t */*size*/);
+
+int
+encode_hdb_entry (
+	unsigned char */*p*/,
+	size_t /*len*/,
+	const hdb_entry */*data*/,
+	size_t */*size*/);
+
+void
+free_Event (Event */*data*/);
+
+void
+free_GENERATION (GENERATION */*data*/);
+
+void
+free_HDBFlags (HDBFlags */*data*/);
+
+void
+free_HDB_Ext_Aliases (HDB_Ext_Aliases */*data*/);
+
+void
+free_HDB_Ext_Constrained_delegation_acl (HDB_Ext_Constrained_delegation_acl */*data*/);
+
+void
+free_HDB_Ext_Lan_Manager_OWF (HDB_Ext_Lan_Manager_OWF */*data*/);
+
+void
+free_HDB_Ext_PKINIT_acl (HDB_Ext_PKINIT_acl */*data*/);
+
+void
+free_HDB_Ext_PKINIT_certificate (HDB_Ext_PKINIT_certificate */*data*/);
+
+void
+free_HDB_Ext_Password (HDB_Ext_Password */*data*/);
+
+void
+free_HDB_extension (HDB_extension */*data*/);
+
+void
+free_HDB_extensions (HDB_extensions */*data*/);
+
+void
+free_Key (Key */*data*/);
+
+void
+free_Salt (Salt */*data*/);
+
+void
+free_hdb_entry (hdb_entry */*data*/);
+
 krb5_error_code
 hdb_add_master_key (
 	krb5_context /*context*/,
@@ -302,6 +613,57 @@ hdb_write_master_key (
 	const char */*filename*/,
 	hdb_master_key /*mkey*/);
 
+void
+initialize_hdb_error_table (void);
+
+void
+initialize_hdb_error_table_r (struct et_list **/*list*/);
+
+HDBFlags
+int2HDBFlags (unsigned /*n*/);
+
+size_t
+length_Event (const Event */*data*/);
+
+size_t
+length_GENERATION (const GENERATION */*data*/);
+
+size_t
+length_HDBFlags (const HDBFlags */*data*/);
+
+size_t
+length_HDB_Ext_Aliases (const HDB_Ext_Aliases */*data*/);
+
+size_t
+length_HDB_Ext_Constrained_delegation_acl (const HDB_Ext_Constrained_delegation_acl */*data*/);
+
+size_t
+length_HDB_Ext_Lan_Manager_OWF (const HDB_Ext_Lan_Manager_OWF */*data*/);
+
+size_t
+length_HDB_Ext_PKINIT_acl (const HDB_Ext_PKINIT_acl */*data*/);
+
+size_t
+length_HDB_Ext_PKINIT_certificate (const HDB_Ext_PKINIT_certificate */*data*/);
+
+size_t
+length_HDB_Ext_Password (const HDB_Ext_Password */*data*/);
+
+size_t
+length_HDB_extension (const HDB_extension */*data*/);
+
+size_t
+length_HDB_extensions (const HDB_extensions */*data*/);
+
+size_t
+length_Key (const Key */*data*/);
+
+size_t
+length_Salt (const Salt */*data*/);
+
+size_t
+length_hdb_entry (const hdb_entry */*data*/);
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/source4/heimdal/lib/hdb/hdb.c b/source4/heimdal/lib/hdb/hdb.c
index e8161afbc1..df342ffadf 100644
--- a/source4/heimdal/lib/hdb/hdb.c
+++ b/source4/heimdal/lib/hdb/hdb.c
@@ -33,7 +33,7 @@
 
 #include "hdb_locl.h"
 
-RCSID("$Id: hdb.c,v 1.56 2005/10/19 13:51:40 lha Exp $");
+RCSID("$Id: hdb.c,v 1.59 2005/11/30 12:22:09 lha Exp $");
 
 #ifdef HAVE_DLFCN_H
 #include <dlfcn.h>
@@ -53,16 +53,17 @@ static struct hdb_method methods[] = {
 #endif
 #if defined(OPENLDAP) && !defined(OPENLDAP_MODULE)
     {"ldap:",	hdb_ldap_create},
+    {"ldapi:",	hdb_ldapi_create},
 #endif
+    {NULL,	NULL}
+};
+
 #if HAVE_DB1 || HAVE_DB3
-    {"",	hdb_db_create},
+static struct hdb_method dbmetod = {"",	hdb_db_create };
 #elif defined(HAVE_NDBM)
-    {"",	hdb_ndbm_create},
-#elif defined(OPENLDAP) && !defined(OPENLDAP_MODULE)
-    {"",	hdb_ldap_create},
+static struct hdb_method dbmetod = {"",	hdb_ndbm_create };
 #endif
-    {NULL,	NULL}
-};
+
 
 krb5_error_code
 hdb_next_enctype2key(krb5_context context,
@@ -337,11 +338,22 @@ find_method (const char *filename, const char **rest)
 {
     const struct hdb_method *h;
 
-    for (h = methods; h->prefix != NULL; ++h)
+    for (h = methods; h->prefix != NULL; ++h) {
 	if (strncmp (filename, h->prefix, strlen(h->prefix)) == 0) {
 	    *rest = filename + strlen(h->prefix);
 	    return h;
 	}
+    }
+#if defined(HAVE_DB1) || defined(HAVE_DB3) || defined(HAVE_NDBM)
+    if (strncmp(filename, "/", 1) == 0
+	|| strncmp(filename, "./", 2) == 0
+	|| strncmp(filename, "../", 3) == 0)
+    {
+	*rest = filename;
+	return &dbmetod;
+    }
+#endif
+
     return NULL;
 }
 
@@ -367,8 +379,6 @@ hdb_list_builtin(krb5_context context, char **list)
     buf[0] = '\0';
 
     for (h = methods; h->prefix != NULL; ++h) {
-	if (h->prefix[0] == '\0')
-	    continue;
 	if (h != methods)
 	    strlcat(buf, ", ", len);
 	strlcat(buf, h->prefix, len);
diff --git a/source4/heimdal/lib/hdb/ndbm.c b/source4/heimdal/lib/hdb/ndbm.c
index dfd5bfa8f1..793d03829d 100644
--- a/source4/heimdal/lib/hdb/ndbm.c
+++ b/source4/heimdal/lib/hdb/ndbm.c
@@ -33,7 +33,7 @@
 
 #include "hdb_locl.h"
 
-RCSID("$Id: ndbm.c,v 1.35 2005/06/23 13:37:57 lha Exp $");
+RCSID("$Id: ndbm.c,v 1.36 2005/11/28 23:31:36 lha Exp $");
 
 #if HAVE_NDBM
 
@@ -333,7 +333,7 @@ krb5_error_code
 hdb_ndbm_create(krb5_context context, HDB **db, 
 		const char *filename)
 {
-    *db = malloc(sizeof(**db));
+    *db = calloc(1, sizeof(**db));
     if (*db == NULL) {
 	krb5_set_error_string(context, "malloc: out of memory");
 	return ENOMEM;