r14198: Update Samba4 to current lorikeet-heimdal.

Andrew Bartlett
(This used to be commit 97a0a0e2fa6784e5fc5278f7a15b385ddcb6a3b3)

4 files changed, 9 insertions, 367 deletions

diff --git a/source4/heimdal/lib/hdb/hdb-protos.h b/source4/heimdal/lib/hdb/hdb-protos.h
index 67e19f7e4a..3cc7d2131a 100644
--- a/source4/heimdal/lib/hdb/hdb-protos.h
+++ b/source4/heimdal/lib/hdb/hdb-protos.h
@@ -8,317 +8,6 @@
 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*/,
@@ -491,12 +180,6 @@ hdb_ldapi_create (
 	const char */*arg*/);
 
 krb5_error_code
-hdb_ldb_create (
-	krb5_context /*context*/,
-	HDB ** /*db*/,
-	const char */*arg*/);
-
-krb5_error_code
 hdb_list_builtin (
 	krb5_context /*context*/,
 	char **/*list*/);
@@ -627,54 +310,6 @@ hdb_write_master_key (
 	const char */*filename*/,
 	hdb_master_key /*mkey*/);
 
-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 406a50ecbd..b89937f82f 100644
--- a/source4/heimdal/lib/hdb/hdb.c
+++ b/source4/heimdal/lib/hdb/hdb.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997 - 2004 Kungliga Tekniska Högskolan
+ * Copyright (c) 1997 - 2004 Kungliga Tekniska Högskolan
  * (Royal Institute of Technology, Stockholm, Sweden). 
  * All rights reserved. 
  *
diff --git a/source4/heimdal/lib/hdb/hdb_locl.h b/source4/heimdal/lib/hdb/hdb_locl.h
index 0d07164bd1..0bf4e8191c 100644
--- a/source4/heimdal/lib/hdb/hdb_locl.h
+++ b/source4/heimdal/lib/hdb/hdb_locl.h
@@ -64,4 +64,11 @@
 #include <hdb.h>
 #include <hdb-private.h>
 
+krb5_error_code
+hdb_ldb_create (
+       krb5_context /*context*/,
+       HDB ** /*db*/,
+       const char */*arg*/);
+
+
 #endif /* __HDB_LOCL_H__ */
diff --git a/source4/heimdal/lib/hdb/keytab.c b/source4/heimdal/lib/hdb/keytab.c
index 21ee2f4274..6fb37842dc 100644
--- a/source4/heimdal/lib/hdb/keytab.c
+++ b/source4/heimdal/lib/hdb/keytab.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999 - 2002 Kungliga Tekniska Högskolan
+ * Copyright (c) 1999 - 2002 Kungliga Tekniska Högskolan
  * (Royal Institute of Technology, Stockholm, Sweden). 
  * All rights reserved. 
  *