diff options
| author | Kevin Wasserman <kevin.wasserman@painless-security.com> | 2012-07-28 08:14:24 -0400 |
|---|---|---|
| committer | Ben Kaduk <kaduk@mit.edu> | 2012-08-29 14:50:19 -0400 |
| commit | 2ecba2452ab53e13f138b03b64df8f9a91e87284 (patch) | |
| tree | 3af4ff0e175cd34ebdf687409d292693c8bb8470 /src/windows/installer | |
| parent | 9d528cd3cad2d6ea78310abe12186eedb1ac9314 (diff) | |
| download | krb5-2ecba2452ab53e13f138b03b64df8f9a91e87284.tar.gz krb5-2ecba2452ab53e13f138b03b64df8f9a91e87284.tar.xz krb5-2ecba2452ab53e13f138b03b64df8f9a91e87284.zip | |
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@painless-security.com>
ticket: 7323 (new)
queue: kfw
target_version: 1.10.4
tags: pullup
Diffstat (limited to 'src/windows/installer')
| -rw-r--r-- | src/windows/installer/wix/athena/krb5.ini | 3 | ||||
| -rw-r--r-- | src/windows/installer/wix/config.wxi | 7 | ||||
| -rw-r--r-- | src/windows/installer/wix/krb5.ini | 3 | ||||
| -rw-r--r-- | 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 0000000000..681ed65a31 --- /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 806fe36f21..40bdb7ccab 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 681ed65a31..e69de29bb2 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 c3ebc02b07..7a650694b8 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> |