krb5 commit: Put athena-specific krb5.ini in athena subdir

[Benjamin Kaduk]

https://github.com/krb5/krb5/commit/2ecba2452ab53e13f138b03b64df8f9a91e87284
commit 2ecba2452ab53e13f138b03b64df8f9a91e87284
Author: Kevin Wasserman <kevin.wasserman at painless-security.com>
Date:   Sat Jul 28 08:14:24 2012 -0400

    Put athena-specific krb5.ini in athena subdir
    
    The installer only picks it up if MIT_INTERNAL is defined in
    the environment; otherwise it uses the now-empty krb5.ini in
    the base directory.
    
    Signed-off-by: Kevin Wasserman <kevin.wasserman at painless-security.com>
    
    ticket: 7323 (new)
    queue: kfw
    target_version: 1.10.4
    tags: pullup

 src/windows/installer/wix/athena/krb5.ini |    3 +++
 src/windows/installer/wix/config.wxi      |    7 ++++++-
 src/windows/installer/wix/krb5.ini        |    3 ---
 src/windows/installer/wix/site-local.wxi  |   12 ------------
 4 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/src/windows/installer/wix/athena/krb5.ini b/src/windows/installer/wix/athena/krb5.ini
new file mode 100644
index 0000000..681ed65
--- /dev/null
+++ b/src/windows/installer/wix/athena/krb5.ini
@@ -0,0 +1,3 @@
+[libdefaults]
+	default_realm = ATHENA.MIT.EDU
+	allow_weak_crypto = true
diff --git a/src/windows/installer/wix/config.wxi b/src/windows/installer/wix/config.wxi
index 806fe36..40bdb7c 100644
--- a/src/windows/installer/wix/config.wxi
+++ b/src/windows/installer/wix/config.wxi
@@ -58,7 +58,12 @@
     <?define SrcDir="$(var.TargetDir)"?>
     <?define InstallDir="$(var.TargetDir)windows\installer\"?>
     <?define SampleDir="$(var.TargetDir)sample\"?>
-    <?define ConfigDir=".\"?>
+    <?ifdef env.MIT_INTERNAL?>
+      <?define ConfigDir=".\athena\"?>
+    <?else?>
+      <?define ConfigDir=".\"?>
+    <?endif?>
+
     <?define SystemDir="$(env.SystemRoot)\System32\"?>
 
     <?include lang\config_$(var.BuildLang).wxi?>
diff --git a/src/windows/installer/wix/krb5.ini b/src/windows/installer/wix/krb5.ini
index 681ed65..e69de29 100644
--- a/src/windows/installer/wix/krb5.ini
+++ b/src/windows/installer/wix/krb5.ini
@@ -1,3 +0,0 @@
-[libdefaults]
-	default_realm = ATHENA.MIT.EDU
-	allow_weak_crypto = true
diff --git a/src/windows/installer/wix/site-local.wxi b/src/windows/installer/wix/site-local.wxi
index c3ebc02..7a65069 100644
--- a/src/windows/installer/wix/site-local.wxi
+++ b/src/windows/installer/wix/site-local.wxi
@@ -38,9 +38,6 @@
         <?define ProductCode="????????-????-????-????-????????????"?>
     <?endif?>
 
-    <!-- DefaultRealm, is your default realm.  Must be uppercase -->
-    <?define DefaultRealm="ATHENA.MIT.EDU"?>
-
     <!-- One of the following must be defined and must correspond to the
          version of compiler used for building Kerberos for Windows -->
 
@@ -69,10 +66,6 @@
         <?define TargetDir="$(sys.SOURCEFILEDIR)..\..\..\"?>
     <?endif?>
 
-    <?ifndef ConfigDir?>
-        <?define ConfigDir="$(env.SystemRoot)\"?>
-    <?endif?>
-
     <?ifndef VersionMajor?>
         <?define VersionMajor="4"?>
         <?define VersionMinor="0"?>
@@ -91,11 +84,6 @@
         <?error Must define BuildLang?>
     <?endif?>
 
-    <!-- DefaultRealm.  Must be uppercase. -->
-    <?ifndef DefaultRealm?>
-        <?error Must define DefaultRealm?>
-    <?endif?>
-
     <!-- The build makefile defines 'Date' and 'Time' which are strings that
          identify the time at which the build was performed. -->
 </Include>