From 3c3e2ad5e6e11451fe8376387b0c29ad0d4bff8a Mon Sep 17 00:00:00 2001
From: Jeffrey Altman <jaltman@secure-endpoints.com>
Date: Sun, 8 Sep 2013 18:20:24 -0400
Subject: [PATCH] Windows: ktutil.exe requires libkadmsrv and libhdb

Include libkadmsrv.dll and libhdb.dll in the assembly which are
required for ktutil.exe to load.

Change-Id: Ic72d51e72daac71683a7f7000fe084197ee3c94a
---
 kdc/NTMakefile                                         | 2 +-
 lib/hdb/NTMakefile                                     | 2 +-
 lib/kadm5/NTMakefile                                   | 2 +-
 packages/windows/assembly/Heimdal.Kerberos.manifest.in | 4 ++++
 packages/windows/assembly/NTMakefile                   | 6 +++++-
 5 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/kdc/NTMakefile b/kdc/NTMakefile
index b7bebfecc..b0b6584c6 100644
--- a/kdc/NTMakefile
+++ b/kdc/NTMakefile
@@ -115,7 +115,7 @@ LIBKDCRES=$(OBJ)\libkdc-version.res
 
 $(LIBEXECDIR)\libkdc.dll: $(LIBKDC_OBJS) $(LIBKDC_LIBS) $(LIBKDCRES)
 	$(DLLGUILINK) -implib:$(LIBKDC) -def:libkdc-exports.def
-	$(DLLPREP)
+	$(DLLPREP_NODIST)
 
 $(LIBKDC): $(LIBEXECDIR)\libkdc.dll
 
diff --git a/lib/hdb/NTMakefile b/lib/hdb/NTMakefile
index b985c0c8c..3e7b455d3 100644
--- a/lib/hdb/NTMakefile
+++ b/lib/hdb/NTMakefile
@@ -129,7 +129,7 @@ $(LIBHDB): $(BINDIR)\libhdb.dll
 
 $(BINDIR)\libhdb.dll: $(libhdb_OBJs) $(ldap_lib) $(LIBHEIMBASE) $(LIBHEIMDAL) $(LIBSQLITE) $(LIBCOMERR) $(LIBROKEN) $(RES)
 	$(DLLGUILINK) -def:libhdb-exports.def -implib:$(LIBHDB)
-	$(DLLPREP)
+	$(DLLPREP_NODIST)
 
 clean::
 	-$(RM) $(BINDIR)\libhdb.*
diff --git a/lib/kadm5/NTMakefile b/lib/kadm5/NTMakefile
index 224404619..3ef637637 100644
--- a/lib/kadm5/NTMakefile
+++ b/lib/kadm5/NTMakefile
@@ -218,7 +218,7 @@ $(LIBKADM5SRV): $(BINDIR)\libkadm5srv.dll
 
 $(BINDIR)\libkadm5srv.dll: $(LIBKADM5SRV_OBJS) $(LIBHEIMDAL) $(LIBROKEN) $(LIBHDB) $(LIBCOMERR) $(LIBSQLITE) $(LIBKADM5SRVRES) $(LIBHEIMBASE)
 	$(DLLGUILINK) -implib:$(LIBKADM5SRV) -def:libkadm5srv-exports.def
-	$(DLLPREP)
+	$(DLLPREP_NODIST)
 
 all:: $(INCFILES) $(LIBKADM5SRV) $(LIBKADM5CLNT)
 
diff --git a/packages/windows/assembly/Heimdal.Kerberos.manifest.in b/packages/windows/assembly/Heimdal.Kerberos.manifest.in
index dc14415a7..515b441c8 100644
--- a/packages/windows/assembly/Heimdal.Kerberos.manifest.in
+++ b/packages/windows/assembly/Heimdal.Kerberos.manifest.in
@@ -8,8 +8,12 @@
   <file name="com_err.dll" hashalg="SHA1" />
   <file name="heimntlm.dll" hashalg="SHA1" />
   <file name="gssapi.dll" hashalg="SHA1" />
+  <file name="libhdb.dll" hashalg="SHA1" />
+  <file name="libkadm5srv.dll" hashalg="SHA1" />
   <file name="heimdal.pdb" hashalg="SHA1" />
   <file name="com_err.pdb" hashalg="SHA1" />
   <file name="heimntlm.pdb" hashalg="SHA1" />
   <file name="gssapi.pdb" hashalg="SHA1" />
+  <file name="libhdb.pdb" hashalg="SHA1" />
+  <file name="libkadm5srv.pdb" hashalg="SHA1" />
 </assembly>
diff --git a/packages/windows/assembly/NTMakefile b/packages/windows/assembly/NTMakefile
index 25248fe57..954e767a5 100644
--- a/packages/windows/assembly/NTMakefile
+++ b/packages/windows/assembly/NTMakefile
@@ -60,10 +60,14 @@ ASMKRBBINS=\
 	$(ASMKRBDIR)\com_err.dll	\
 	$(ASMKRBDIR)\heimntlm.dll	\
 	$(ASMKRBDIR)\gssapi.dll		\
+	$(ASMKRBDIR)\libhdb.dll		\
+	$(ASMKRBDIR)\libkadm5srv.dll	\
 	$(ASMKRBDIR)\heimdal.pdb	\
 	$(ASMKRBDIR)\com_err.pdb	\
 	$(ASMKRBDIR)\heimntlm.pdb	\
-	$(ASMKRBDIR)\gssapi.pdb
+	$(ASMKRBDIR)\gssapi.pdb		\
+	$(ASMKRBDIR)\libhdb.pdb		\
+	$(ASMKRBDIR)\libkadm5srv.pdb
 
 $(ASMKRBDIR)\$(ASMKRBMAN).nohash: Heimdal.Kerberos.manifest.in
 	$(SED)  -e "s,[@]name[@],$(ASMKRBNAME),g" \