From d1d66447a316d74257bbe650257b1b977ab0b03a Mon Sep 17 00:00:00 2001
From: "Enming.Zhang" <zvampirem77@gmail.com>
Date: Tue, 27 Nov 2018 05:05:32 -0500
Subject: [PATCH] rgw: fix obj can still be deleted even if deleteobject policy
 is set

Fixes: http://tracker.ceph.com/issues/37403

Signed-off-by: Enming.Zhang <zvampirem77@gmail.com>
(cherry picked from commit 84879e915eb3f01b453aa2138cd44c09925e7cd1)

Conflicts:
	src/rgw/rgw_op.cc : Resolved in verify_permission
---
 src/rgw/rgw_op.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/rgw/rgw_op.cc b/src/rgw/rgw_op.cc
index 1863d7933375b..a54b512f047e5 100644
--- a/src/rgw/rgw_op.cc
+++ b/src/rgw/rgw_op.cc
@@ -4352,7 +4352,7 @@ int RGWDeleteObj::verify_permission()
     if (r == Effect::Allow)
       return true;
     else if (r == Effect::Deny)
-      return false;
+      return -EACCES;
   }
 
   if (!verify_bucket_permission_no_policy(s, RGW_PERM_WRITE)) {
-- 
2.39.5