Fix conflicts after heimdal-1.1 import and add build infrastructure. Import

all non-style changes made by heimdal to our own libgssapi.

2 files changed, 77 insertions, 0 deletions

diff --git a/kerberos5/lib/libgssapi_ntlm/Makefile b/kerberos5/lib/libgssapi_ntlm/Makefile
new file mode 100644
index 0000000..cbecc2d
--- /dev/null
+++ b/kerberos5/lib/libgssapi_ntlm/Makefile
@@ -0,0 +1,44 @@
+# $FreeBSD$
+
+LIB=	gssapi_ntlm
+LDFLAGS= -Wl,-Bsymbolic
+LDADD=	-lkrb5 -lhx509 -lheimntlm -lroken
+DPADD=	${LIBKRB5} ${LIBHX509} ${LIBHEIMNTLM} ${LIBROKEN}
+
+SRCS=	accept_sec_context.c \
+	acquire_cred.c \
+	add_cred.c \
+	canonicalize_name.c \
+	compare_name.c \
+	context_time.c \
+	crypto.c \
+	delete_sec_context.c \
+	display_name.c \
+	display_status.c \
+	duplicate_name.c \
+	export_name.c \
+	export_sec_context.c \
+	external.c \
+	ntlm.h \
+	ntlm-private.h \
+	import_name.c \
+	import_sec_context.c \
+	indicate_mechs.c \
+	init_sec_context.c \
+	inquire_context.c \
+	inquire_cred.c \
+	inquire_cred_by_mech.c \
+	inquire_mechs_for_name.c \
+	inquire_names_for_mech.c \
+	prefix.c \
+	process_context_token.c \
+	release_cred.c \
+	release_name.c \
+	digest.c
+
+CFLAGS+=-I${KRB5DIR}/lib/gssapi
+CFLAGS+=-I${KRB5DIR}/lib/ntlm
+
+.include <bsd.lib.mk>
+
+.PATH: ${KRB5DIR}/lib/gssapi/ntlm ${.CURDIR}/../../../lib/libgssapi
diff --git a/kerberos5/lib/libgssapi_ntlm/prefix.c b/kerberos5/lib/libgssapi_ntlm/prefix.c
new file mode 100644
index 0000000..68db641
--- /dev/null
+++ b/kerberos5/lib/libgssapi_ntlm/prefix.c
@@ -0,0 +1,33 @@
+/*-
+ * Copyright (c) 2008 Doug Rabson
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. 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.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR 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 AUTHOR 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.
+ *
+ * $FreeBSD$
+ */
+
+const char *
+_gss_name_prefix(void)
+{
+	return "_gss_ntlm";
+}