From: Stefan Metzmacher <metze@samba.org>
Date: Tue, 26 Aug 2008 09:42:13 +0000 (+0200)
Subject: heimdal_build: split glue.c into krb5 and gssapi parts
X-Git-Tag: samba-4.0.0alpha6~801^3~71^2~13
X-Git-Url: http://git.samba.org/?a=commitdiff_plain;h=e7c171590aab4f4cd91c1a2f5a04c8f0ed88a70c;p=samba.git

heimdal_build: split glue.c into krb5 and gssapi parts

metze
(This used to be commit 1c7bb21bd85900206e9ad831bc4795c1f765a9aa)
---

diff --git a/source4/heimdal_build/gssapi-glue.c b/source4/heimdal_build/gssapi-glue.c
new file mode 100644
index 00000000000..0885c2165b0
--- /dev/null
+++ b/source4/heimdal_build/gssapi-glue.c
@@ -0,0 +1,27 @@
+/*
+   Unix SMB/CIFS implementation.
+
+   provide glue functions between heimdal and samba
+
+   Copyright (C) Andrew Tridgell 2005
+
+   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 "lib/replace/replace.h"
+
+void *__gss_ntlm_initialize(void)
+{
+	return NULL;
+}
diff --git a/source4/heimdal_build/internal.mk b/source4/heimdal_build/internal.mk
index 8c576bd2c6a..3bda661946f 100644
--- a/source4/heimdal_build/internal.mk
+++ b/source4/heimdal_build/internal.mk
@@ -174,15 +174,16 @@ HEIMDAL_GSSAPI_OBJ_FILES = \
 	$(heimdalsrcdir)/lib/gssapi/krb5/accept_sec_context.o \
 	$(heimdalsrcdir)/lib/gssapi/krb5/set_sec_context_option.o \
 	$(heimdalsrcdir)/lib/gssapi/krb5/process_context_token.o \
-	$(heimdalsrcdir)/lib/gssapi/krb5/prf.o
-
+	$(heimdalsrcdir)/lib/gssapi/krb5/prf.o \
+	$(heimdalbuildsrcdir)/gssapi-glue.o
 
 #######################
 # Start SUBSYSTEM HEIMDAL_KRB5
 [SUBSYSTEM::HEIMDAL_KRB5]
 CFLAGS = -I$(heimdalbuildsrcdir) -I$(heimdalsrcdir)/lib/krb5 -I$(heimdalsrcdir)/lib/asn1 -I$(heimdalsrcdir)/lib/com_err 
 PRIVATE_DEPENDENCIES = HEIMDAL_ROKEN HEIMDAL_PKINIT_ASN1 HEIMDAL_WIND \
-		HEIMDAL_KRB5_ASN1 HEIMDAL_GLUE HEIMDAL_HX509 HEIMDAL_HCRYPTO
+		HEIMDAL_KRB5_ASN1 HEIMDAL_HX509 HEIMDAL_HCRYPTO \
+		LIBNETIF LIBSAMBA-HOSTCONFIG
 PUBLIC_DEPENDENCIES = HEIMDAL_COM_ERR
 # End SUBSYSTEM HEIMDAL_KRB5
 #######################
@@ -273,7 +274,8 @@ HEIMDAL_KRB5_OBJ_FILES = \
 	$(heimdalsrcdir)/lib/krb5/krb5_err.o \
 	$(heimdalsrcdir)/lib/krb5/heim_err.o \
 	$(heimdalsrcdir)/lib/krb5/k524_err.o \
-	$(heimdalsrcdir)/lib/krb5/krb_err.o
+	$(heimdalsrcdir)/lib/krb5/krb_err.o \
+	$(heimdalbuildsrcdir)/krb5-glue.o
 
 #######################
 # Start SUBSYSTEM HEIMDAL_HEIM_ASN1
@@ -474,16 +476,6 @@ HEIMDAL_ROKEN_OBJ_FILES = \
 	$(heimdalsrcdir)/lib/roken/xfree.o \
 	$(heimdalbuildsrcdir)/replace.o
 
-#######################
-# Start SUBSYSTEM HEIMDAL_GLUE
-[SUBSYSTEM::HEIMDAL_GLUE]
-CFLAGS = -I$(heimdalbuildsrcdir) -I$(heimdalsrcdir)/lib/krb5 -I$(heimdalsrcdir)/lib/asn1 -I$(heimdalsrcdir)/lib/com_err 
-PRIVATE_DEPENDENCIES = LIBNETIF LIBSAMBA-HOSTCONFIG
-# End SUBSYSTEM HEIMDAL_GLUE
-#######################
-
-HEIMDAL_GLUE_OBJ_FILES = $(heimdalbuildsrcdir)/glue.o
-
 #######################
 # Start SUBSYSTEM HEIMDAL_COM_ERR
 [SUBSYSTEM::HEIMDAL_COM_ERR]
diff --git a/source4/heimdal_build/glue.c b/source4/heimdal_build/krb5-glue.c
similarity index 96%
rename from source4/heimdal_build/glue.c
rename to source4/heimdal_build/krb5-glue.c
index 07062ae8bfd..835e51cc020 100644
--- a/source4/heimdal_build/glue.c
+++ b/source4/heimdal_build/krb5-glue.c
@@ -57,9 +57,3 @@ krb5_error_code KRB5_LIB_FUNCTION krb5_get_all_client_addrs(krb5_context context
 
 	return 0;
 }
-
-
-void *__gss_ntlm_initialize(void)
-{
-	return NULL;
-}