s4:heimdal: import lorikeet-heimdal-200908050050 (commit 8714779fa7376fd9f7761587639e68b48afc8c9c)

This also adds a new hdb-glue.c file, to cope with Heimdal's
uncondtional enabling of SQLITE.

(Very reasonable, but not required for Samba4's use).

Andrew Bartlett

2 files changed, 40 insertions, 1 deletions

diff --git a/source4/heimdal_build/hdb-glue.c b/source4/heimdal_build/hdb-glue.c
new file mode 100644
index 00000000000..c25a2f984ee
--- /dev/null
+++ b/source4/heimdal_build/hdb-glue.c
@@ -0,0 +1,35 @@
+/* 
+   Unix SMB/CIFS implementation.
+
+   provide glue functions between heimdal and samba
+
+   Copyright (C) Andrew Bartlett <abartlet@samba.org> 2009
+   
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+   
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+   
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include "includes.h"
+#include "system/network.h"
+#include "system/kerberos.h"
+#include "lib/socket/netif.h"
+#include "param/param.h"
+
+#include "heimdal/lib/hdb/hdb_locl.h"
+
+krb5_error_code
+hdb_sqlite_create(krb5_context context, HDB **db, const char *argument)
+{
+	return EINVAL;
+}
+
diff --git a/source4/heimdal_build/internal.mk b/source4/heimdal_build/internal.mk
index 52281807b50..439f94aaf58 100644
--- a/source4/heimdal_build/internal.mk
+++ b/source4/heimdal_build/internal.mk
@@ -93,7 +93,8 @@ HEIMDAL_HDB_OBJ_FILES = \
 	$(heimdalsrcdir)/lib/hdb/keytab.o \
 	$(heimdalsrcdir)/lib/hdb/mkey.o \
 	$(heimdalsrcdir)/lib/hdb/ndbm.o \
-	$(heimdalsrcdir)/lib/hdb/hdb_err.o
+	$(heimdalsrcdir)/lib/hdb/hdb_err.o \
+	$(heimdalbuildsrcdir)/hdb-glue.o
 
 $(eval $(call heimdal_proto_header_template, \
   $(heimdalsrcdir)/lib/hdb/hdb-protos.h, \
@@ -169,8 +170,10 @@ HEIMDAL_GSSAPI_KRB5_OBJ_FILES = \
 	$(heimdalsrcdir)/lib/gssapi/krb5/release_buffer.o \
 	$(heimdalsrcdir)/lib/gssapi/krb5/external.o \
 	$(heimdalsrcdir)/lib/gssapi/krb5/compat.o \
+	$(heimdalsrcdir)/lib/gssapi/krb5/creds.o \
 	$(heimdalsrcdir)/lib/gssapi/krb5/acquire_cred.o \
 	$(heimdalsrcdir)/lib/gssapi/krb5/release_cred.o \
+	$(heimdalsrcdir)/lib/gssapi/krb5/store_cred.o \
 	$(heimdalsrcdir)/lib/gssapi/krb5/set_cred_option.o \
 	$(heimdalsrcdir)/lib/gssapi/krb5/decapsulate.o \
 	$(heimdalsrcdir)/lib/gssapi/krb5/verify_mic.o \
@@ -197,6 +200,7 @@ HEIMDAL_GSSAPI_OBJ_FILES = \
 	$(heimdalsrcdir)/lib/gssapi/mech/gss_buffer_set.o \
 	$(heimdalsrcdir)/lib/gssapi/mech/gss_aeap.o \
 	$(heimdalsrcdir)/lib/gssapi/mech/gss_add_cred.o \
+	$(heimdalsrcdir)/lib/gssapi/mech/gss_cred.o \
 	$(heimdalsrcdir)/lib/gssapi/mech/gss_add_oid_set_member.o \
 	$(heimdalsrcdir)/lib/gssapi/mech/gss_compare_name.o \
 	$(heimdalsrcdir)/lib/gssapi/mech/gss_release_oid_set.o \