From 9c72bf871f18ccbbf04cefae8e8e2ae436a2ff8d Mon Sep 17 00:00:00 2001
From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com>
Date: Mon, 12 Oct 2020 10:42:01 +0000
Subject: [PATCH] Move no-0-rent rent dist. behavior under feature (#12804)
 (#12810)

(cherry picked from commit 2f5bb7e507279d7eff94e8a25bc931c3d2711c39)

Co-authored-by: Ryo Onodera <ryoqun@gmail.com>
---
 runtime/src/bank.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/runtime/src/bank.rs b/runtime/src/bank.rs
index ca109f808f..ff5b72745d 100644
--- a/runtime/src/bank.rs
+++ b/runtime/src/bank.rs
@@ -2561,7 +2561,7 @@ impl Bank {
                 } else {
                     rent_share
                 };
-                if rent_to_be_paid > 0 {
+                if !enforce_fix || rent_to_be_paid > 0 {
                     let mut account = self.get_account(&pubkey).unwrap_or_default();
                     account.lamports += rent_to_be_paid;
                     self.store_account(&pubkey, &account);