From: Ben Kaduk <kaduk@mit.edu>
Date: Thu, 21 Aug 2014 21:33:11 +0000 (-0400)
Subject: Add some KDC entries to the registry via WiX
X-Git-Tag: krb5-1.12.3-final~29
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c6775894ad477de0c16564c62a88bd435ed0b77b;p=thirdparty%2Fkrb5.git

Add some KDC entries to the registry via WiX

Though our library happily uses DNS, I can't get Windows to
successfully contact KDCs found through the SRV records.
So, we do need to stay in the business of shipping around
KDC entries, after all.

(cherry picked from commit d2b76e1ba0f4bb0ec7e560a9a681d938f45f950c)

ticket: 7999
---

diff --git a/src/windows/installer/wix/files.wxi b/src/windows/installer/wix/files.wxi
index 02cb830150..01879ca319 100644
--- a/src/windows/installer/wix/files.wxi
+++ b/src/windows/installer/wix/files.wxi
@@ -139,6 +139,19 @@
                     <Component Win64="$(var.Win64)" Id="cmf_krb5_32_dll" Guid="$(var.cmf_krb5_32_dll_guid)" DiskId="1">
 	                    <File Id="fil_krb5_32_dll" Name="$(var.cmf_krb5_32_dll_name)" KeyPath="yes" />
 	                    <Environment Id="env_kclient_path" Action="set" Name="PATH" Part="last" System="yes" Value="[KERBEROSDIR]bin" />
+	                    <RegistryKey Root="HKLM" Key="SYSTEM\CurrentControlSet\Control\Lsa\Kerberos\Domains\ATHENA.MIT.EDU">
+	                      <RegistryValue Name="KdcNames" Type="multiString">
+	                        <MultiStringValue>kerberos.mit.edu</MultiStringValue>
+	                        <MultiStringValue>kerberos-1.mit.edu</MultiStringValue>
+	                        <MultiStringValue>kerberos-2.mit.edu</MultiStringValue>
+	                      </RegistryValue>
+	                    </RegistryKey>
+	                    <RegistryKey Root="HKLM" Key="SYSTEM\CurrentControlSet\Control\Lsa\Kerberos\Domains\CSAIL.MIT.EDU">
+	                      <RegistryValue Name="KdcNames" Type="multiString">
+	                        <MultiStringValue>kerberos-1.mit.edu</MultiStringValue>
+	                        <MultiStringValue>kerberos-2.mit.edu</MultiStringValue>
+	                      </RegistryValue>
+	                    </RegistryKey>
                     </Component>
                     <Component Win64="$(var.Win64)" Id="cmf_k5sprt32_dll" Guid="$(var.cmf_k5sprt32_dll_guid)" DiskId="1">
 	                    <File Id="fil_k5sprt32_dll" Name="$(var.cmf_k5sprt32_dll_name)" />