diff options
| author | Adam Cooper <adam.cooper@mongodb.com> | 2020-11-03 13:59:29 -0500 |
|---|---|---|
| committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2021-06-15 21:47:11 +0000 |
| commit | 888a485aea432659f956f73457d8ce8dfc348713 (patch) | |
| tree | 9ecfd366c5473262b92fe68cea338204a68a23cd | |
| parent | a16bafb9a9dbc7ef2145539c110f680867a35db5 (diff) | |
| download | mongo-888a485aea432659f956f73457d8ce8dfc348713.tar.gz | |
SERVER-50576 mongokerberos utility is missing in the MSI installer
(cherry picked from commit 3970e75445ca03958e86b71b6a2145486526c350)
| -rw-r--r-- | src/mongo/installer/msi/SConscript | 1 | ||||
| -rw-r--r-- | src/mongo/installer/msi/wxs/BinaryFragment.wxs | 4 | ||||
| -rw-r--r-- | src/mongo/installer/msi/wxs/FeatureFragment.wxs | 1 |
3 files changed, 6 insertions, 0 deletions
diff --git a/src/mongo/installer/msi/SConscript b/src/mongo/installer/msi/SConscript index a9b999d1101..416be8c8470 100644 --- a/src/mongo/installer/msi/SConscript +++ b/src/mongo/installer/msi/SConscript @@ -176,6 +176,7 @@ env.Depends(pre_msi_cmd, '#buildscripts/packaging/msi/mongod.yaml') if 'enterprise' in env['MONGO_MODULES']:
env.Depends(pre_msi_cmd, "$DESTDIR/$PREFIX_BINDIR/mongodecrypt.exe")
+ env.Depends(pre_msi_cmd, "$DESTDIR/$PREFIX_BINDIR/mongokerberos.exe")
env.Depends(pre_msi_cmd, "$DESTDIR/$PREFIX_BINDIR/mongoldap.exe")
env.Depends(pre_msi_cmd, "$DESTDIR/$PREFIX_BINDIR/mongocryptd.exe")
diff --git a/src/mongo/installer/msi/wxs/BinaryFragment.wxs b/src/mongo/installer/msi/wxs/BinaryFragment.wxs index 76c6ca3d46b..4a8e4d3eb20 100644 --- a/src/mongo/installer/msi/wxs/BinaryFragment.wxs +++ b/src/mongo/installer/msi/wxs/BinaryFragment.wxs @@ -60,6 +60,10 @@ <File Id="f_mongodecrypt" Name="mongodecrypt.exe" Source="$(var.BinarySource)\mongodecrypt.exe"
DiskId="1" KeyPath="yes"/>
</Component>
+ <Component Id="c_mongokerberos" Guid="AEE18146-7C51-4BAF-ACB1-8140E4F07506">
+ <File Id="f_mongokerberos" Name="mongokerberos.exe"
+ Source="$(var.BinarySource)\mongokerberos.exe" DiskId="1" KeyPath="yes"/>
+ </Component>
<Component Id="c_mongoldap" Guid="553E4E3D-ED32-4ABA-8F27-3A7525C3145C">
<File Id="f_mongoldap" Name="mongoldap.exe" Source="$(var.BinarySource)\mongoldap.exe"
DiskId="1" KeyPath="yes"/>
diff --git a/src/mongo/installer/msi/wxs/FeatureFragment.wxs b/src/mongo/installer/msi/wxs/FeatureFragment.wxs index 16c51fe3149..1bdbd95d20f 100644 --- a/src/mongo/installer/msi/wxs/FeatureFragment.wxs +++ b/src/mongo/installer/msi/wxs/FeatureFragment.wxs @@ -76,6 +76,7 @@ <?if $(var.Edition) = Enterprise ?>
<ComponentGroupRef Id="cg_EnterpriseBase" />
<ComponentRef Id="c_mongodecrypt"/>
+ <ComponentRef Id="c_mongokerberos"/>
<ComponentRef Id="c_mongoldap"/>
<?endif ?>
</Feature>
|