From 988792b3f70ba4f9a94e28b28f6e0b69c02f86ab Mon Sep 17 00:00:00 2001
From: Asanka Herath <asanka@secure-endpoints.com>
Date: Mon, 14 Sep 2009 13:45:10 -0400
Subject: [PATCH] Build system update for lib/gssapi and new exports.def

---
 lib/gssapi/NTMakefile            |  21 ++++---
 lib/gssapi/libgssapi-exports.def | 100 +++++++++++++++++++++++++++++++
 2 files changed, 113 insertions(+), 8 deletions(-)
 create mode 100644 lib/gssapi/libgssapi-exports.def

diff --git a/lib/gssapi/NTMakefile b/lib/gssapi/NTMakefile
index 4fdc275ee..61eb31ab8 100644
--- a/lib/gssapi/NTMakefile
+++ b/lib/gssapi/NTMakefile
@@ -244,6 +244,10 @@ $(OBJ)\gkrb5_err.c $(OBJ)\gkrb5_err.h: krb5\gkrb5_err.et
 
 INCFILES=	\
 	$(INCDIR)\gssapi.h	\
+	$(INCDIR)\gssapi\gssapi.h	\
+	$(INCDIR)\gssapi\gssapi_krb5.h	\
+	$(INCDIR)\gssapi\gssapi_ntlm.h	\
+	$(INCDIR)\gssapi\gssapi_spnego.h \
 	$(OBJ)\ntlm\ntlm-private.h	\
 	$(OBJ)\spnego\spnego-private.h	\
 	$(OBJ)\krb5\gsskrb5-private.h	\
@@ -439,6 +443,9 @@ GCOPTS=-I$(SRCDIR) -I$(OBJ) -Igssapi -DBUILD_GSSAPI_LIB
 {$(OBJ)\gssapi}.x{$(OBJ)\gssapi}.c:
 	$(CP) $** $@
 
+{gssapi}.h{$(INCDIR)\gssapi}.h:
+	$(CP) $** $@
+
 LIBGSSAPI_LIBS=\
 	$(LIBROKEN)	\
 	$(LIBASN1)	\
@@ -452,11 +459,10 @@ LIBGSSAPI_SDKLIBS=\
 
 !ifndef STATICLIBS
 
-$(LIBGSSAPI): $(BINDIR)\libgssapi.dll
-
 $(BINDIR)\libgssapi.dll: $(libgssapi_OBJs)
-	$(DLLGUILINK_C) -IMPLIB:$(LIBGSSAPI) \
-		-OUT:$(BINDIR)\libgssapi.dll \
+	$(DLLGUILINK_C) -implib:$(LIBGSSAPI)	\
+		-out:$(BINDIR)\libgssapi.dll	\
+		-def:libgssapi-exports.def	\
 		$(LIBGSSAPI_LIBS) $(LIBGSSAPI_SDKLIBS) @<<
 $(libgssapi_OBJs: =
 )
@@ -465,11 +471,10 @@ $(libgssapi_OBJs: =
 	$(_VC_MANIFEST_CLEAN)
 	$(_CODESIGN)
 
-all:: $(BINDIR)\libgssapi.dll
+$(LIBGSSAPI): $(BINDIR)\libgssapi.dll
 
 clean::
 	-$(RM) $(BINDIR)\libgssapi.dll
-	-$(RM) $(LIBGSSAPI)
 
 !else
 
@@ -479,13 +484,13 @@ $(libgssapi_OBJs: =
 )
 <<
 
+!endif
+
 all:: $(LIBGSSAPI)
 
 clean::
 	-$(RM) $(LIBGSSAPI)
 
-!endif
-
 prep:: mkdirs-gss
 
 mkdirs-gss:
diff --git a/lib/gssapi/libgssapi-exports.def b/lib/gssapi/libgssapi-exports.def
new file mode 100644
index 000000000..0ba34c861
--- /dev/null
+++ b/lib/gssapi/libgssapi-exports.def
@@ -0,0 +1,100 @@
+EXPORTS
+	GSS_KRB5_MECHANISM
+	GSS_NTLM_MECHANISM
+	GSS_SPNEGO_MECHANISM
+	GSS_SASL_DIGEST_MD5_MECHANISM
+	GSS_C_NT_ANONYMOUS
+	GSS_C_NT_EXPORT_NAME
+	GSS_C_NT_HOSTBASED_SERVICE
+	GSS_C_NT_HOSTBASED_SERVICE_X
+	GSS_C_NT_MACHINE_UID_NAME
+	GSS_C_NT_STRING_UID_NAME
+	GSS_C_NT_USER_NAME
+	GSS_KRB5_NT_PRINCIPAL_NAME
+	GSS_KRB5_NT_USER_NAME
+	GSS_KRB5_NT_MACHINE_UID_NAME
+	GSS_KRB5_NT_STRING_UID_NAME
+	gss_accept_sec_context
+	gss_acquire_cred
+	gss_add_buffer_set_member
+	gss_add_cred
+	gss_add_oid_set_member
+	gss_canonicalize_name
+	gss_compare_name
+	gss_context_query_attributes
+	gss_context_time
+	gss_create_empty_buffer_set
+	gss_create_empty_oid_set
+	gss_decapsulate_token
+	gss_delete_sec_context
+	gss_display_name
+	gss_display_status
+	gss_duplicate_name
+	gss_duplicate_oid
+	gss_encapsulate_token
+	gss_export_name
+	gss_export_sec_context
+	gss_get_mic
+	gss_import_name
+	gss_import_sec_context
+	gss_indicate_mechs
+	gss_init_sec_context
+	gss_inquire_context
+	gss_inquire_cred
+	gss_inquire_cred_by_mech
+	gss_inquire_cred_by_oid
+	gss_inquire_mechs_for_name
+	gss_inquire_names_for_mech
+	gss_inquire_sec_context_by_oid
+	gss_inquire_sec_context_by_oid
+	gss_krb5_ccache_name
+	gss_krb5_copy_ccache
+	gss_krb5_export_lucid_sec_context
+	gss_krb5_free_lucid_sec_context
+	gss_krb5_get_tkt_flags
+	gss_krb5_import_cred
+	gss_krb5_set_allowable_enctypes
+	gss_mg_collect_error
+	gss_oid_equal
+	gss_oid_to_str
+	gss_process_context_token
+	gss_pseudo_random
+	gss_release_buffer
+	gss_release_buffer_set
+	gss_release_cred
+	gss_release_iov_buffer
+	gss_release_name
+	gss_release_oid
+	gss_release_oid_set
+	gss_seal
+	gss_set_cred_option
+	gss_set_sec_context_option
+	gss_sign
+	gss_test_oid_set_member
+	gss_unseal
+	gss_unwrap
+	gss_unwrap_iov
+	gss_verify
+	gss_verify_mic
+	gss_wrap
+	gss_wrap_iov
+	gss_wrap_iov_length
+	gss_wrap_size_limit
+	gsskrb5_extract_authtime_from_sec_context
+	gsskrb5_extract_authz_data_from_sec_context
+	gsskrb5_extract_service_keyblock
+	gsskrb5_get_initiator_subkey
+	gsskrb5_get_subkey
+	gsskrb5_get_time_offset
+	gsskrb5_register_acceptor_identity
+	gsskrb5_set_default_realm
+	gsskrb5_set_dns_canonicalize
+	gsskrb5_set_send_to_kdc
+	gsskrb5_set_time_offset
+	krb5_gss_register_acceptor_identity
+
+; _gsskrb5cfx_ are really internal symbols, but export
+; then now to make testing easier.
+	_gsskrb5cfx_wrap_length_cfx
+	_gssapi_wrap_size_cfx
+