From 3a00c9b7b032e459c5e9927319819398f74c17e7 Mon Sep 17 00:00:00 2001
From: Jeffrey Altman <jaltman@secure-endpoints.com>
Date: Sat, 12 Oct 2013 01:57:14 -0400
Subject: [PATCH] Windows: Install loose gssapi.dll with manifest

When installing the gssapi.dll within the Heimdal\bin directory
make sure to install the version that has the assembly manifest.
Otherwise, the DLL cannot find the heimdal.dll.

Change-Id: Idd6f8f00db718f8a764e1cfa9d06d188ab22a313
---
 packages/windows/installer/NTMakefile            | 1 +
 packages/windows/installer/heimdal-installer.wxs | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/windows/installer/NTMakefile b/packages/windows/installer/NTMakefile
index c9624ec63..127c2dc91 100644
--- a/packages/windows/installer/NTMakefile
+++ b/packages/windows/installer/NTMakefile
@@ -172,6 +172,7 @@ CANDLEOPTS=	\
 	-dDocDir=$(DOCDIR)			\
 	-dSrcDir=$(SRC)				\
 	-dPlatform=$(PLATFORM)			\
+	-dAsmKrbName=$(ASMKRBNAME)		\
 	-dPolPrefix=$(POLPREFIX)
 
 !if "$(CPU)"=="AMD64"
diff --git a/packages/windows/installer/heimdal-installer.wxs b/packages/windows/installer/heimdal-installer.wxs
index a28ffe581..68fb62af0 100644
--- a/packages/windows/installer/heimdal-installer.wxs
+++ b/packages/windows/installer/heimdal-installer.wxs
@@ -201,7 +201,7 @@
       <Component Id='comp.gssdll'
 		 Guid='$(var.GuidGssDll)'
 		 Win64='$(var.Win64)'>
-	<File Name='gssapi.dll' KeyPath='yes' />
+	<File Name='gssapi.dll' KeyPath='yes' Source='$(var.BinDir)\$(var.AsmKrbName)\gssapi.dll' />
 	<File Name='gssapi.pdb' />
       </Component>