From 180baae184f16c26070b4a84d98d86ef164bdfc5 Mon Sep 17 00:00:00 2001
From: Mark Benvenuto <mark.benvenuto@mongodb.com>
Date: Sat, 9 Apr 2022 11:08:41 -0400
Subject: SERVER-59261 Enable Feature flag for PM-2466

---
 src/mongo/crypto/encryption_fields.idl | 3 ++-
 src/mongo/crypto/fle_crypto.cpp        | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

(limited to 'src/mongo/crypto')

diff --git a/src/mongo/crypto/encryption_fields.idl b/src/mongo/crypto/encryption_fields.idl
index 0f298d7de76..1a1090ab59d 100644
--- a/src/mongo/crypto/encryption_fields.idl
+++ b/src/mongo/crypto/encryption_fields.idl
@@ -42,7 +42,8 @@ feature_flags:
     featureFlagFLE2:
         description: "Enable FLE2 support"
         cpp_varname: gFeatureFlagFLE2
-        default: false
+        default: true
+        version: 6.0
 
 structs:
 
diff --git a/src/mongo/crypto/fle_crypto.cpp b/src/mongo/crypto/fle_crypto.cpp
index 8523fc9b2cb..b9e50672e4e 100644
--- a/src/mongo/crypto/fle_crypto.cpp
+++ b/src/mongo/crypto/fle_crypto.cpp
@@ -969,6 +969,7 @@ void parseAndVerifyInsertUpdatePayload(std::vector<EDCServerPayloadInfo>* pField
 
 void collectEDCServerInfo(std::vector<EDCServerPayloadInfo>* pFields,
                           ConstDataRange cdr,
+
                           StringData fieldPath) {
 
     // TODO - validate field is actually indexed in the schema?
-- 
cgit v1.2.1