From 7214a0160a2c541007a39afcbf241a3cd8c9ff52 Mon Sep 17 00:00:00 2001
From: kannappanr <30541348+kannappanr@users.noreply.github.com>
Date: Thu, 28 May 2020 08:31:16 -0700
Subject: [PATCH] allow bucket policy to set/removed in NAS gateway (#9706)

---
 cmd/bucket-metadata-sys.go                | 4 ++--
 mint/run/core/aws-sdk-php/quick-tests.php | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/cmd/bucket-metadata-sys.go b/cmd/bucket-metadata-sys.go
index f94b59865..e635ea050 100644
--- a/cmd/bucket-metadata-sys.go
+++ b/cmd/bucket-metadata-sys.go
@@ -40,7 +40,7 @@ type BucketMetadataSys struct {
 
 // Remove bucket metadata from memory.
 func (sys *BucketMetadataSys) Remove(bucket string) {
-	if globalIsGateway {
+	if globalIsGateway && globalGatewayName != "nas" {
 		return
 	}
 	sys.Lock()
@@ -73,7 +73,7 @@ func (sys *BucketMetadataSys) Update(bucket string, configFile string, configDat
 		return errServerNotInitialized
 	}
 
-	if globalIsGateway {
+	if globalIsGateway && globalGatewayName != "nas" {
 		// This code is needed only for gateway implementations.
 		if configFile == bucketPolicyConfig {
 			config, err := policy.ParseConfig(bytes.NewReader(configData), bucket)
diff --git a/mint/run/core/aws-sdk-php/quick-tests.php b/mint/run/core/aws-sdk-php/quick-tests.php
index 0af49fb53..cf00cb8be 100644
--- a/mint/run/core/aws-sdk-php/quick-tests.php
+++ b/mint/run/core/aws-sdk-php/quick-tests.php
@@ -186,7 +186,7 @@ function testHeadObject($s3Client, $objects) {
         if (getStatusCode($result) != HTTP_OK)
             throw new Exception('headObject API failed for ' .
                                 $bucket . '/' . $object);
-        if ($result['Metadata'] != TEST_METADATA) {
+        if (strtolower($result['Metadata']) != strtolower(TEST_METADATA)) {
             throw new Exception("headObject API Metadata didn't match for " .
                                 $bucket . '/' . $object);
         }