Merge pull request #562 from kri5/wip-4365

rgw: Allow wildcard in supported keystone roles.

Reviewed-by: Yehuda Sadeh <yehuda@inktank.com>

1 files changed, 2 insertions, 1 deletions

diff --git a/src/rgw/rgw_keystone.cc b/src/rgw/rgw_keystone.cc
index bb5091e2d1e..7c746654129 100644
--- a/src/rgw/rgw_keystone.cc
+++ b/src/rgw/rgw_keystone.cc
@@ -1,4 +1,5 @@
 #include <errno.h>
+#include <fnmatch.h>
 
 #include "common/errno.h"
 #include "common/ceph_json.h"
@@ -13,7 +14,7 @@
 bool KeystoneToken::User::has_role(const string& r) {
   list<Role>::iterator iter;
   for (iter = roles.begin(); iter != roles.end(); ++iter) {
-      if (r.compare((*iter).name) == 0) {
+      if (fnmatch(r.c_str(), ((*iter).name.c_str()), 0) == 0) {
         return true;
       }
   }