]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
rgw: fix dns name comparison for virtual hosting 30375/head
authorCasey Bodley <cbodley@redhat.com>
Fri, 6 Sep 2019 18:44:59 +0000 (14:44 -0400)
committerNathan Cutler <ncutler@suse.com>
Fri, 13 Sep 2019 09:41:46 +0000 (11:41 +0200)
Fixes: https://tracker.ceph.com/issues/41692
Signed-off-by: Casey Bodley <cbodley@redhat.com>
(cherry picked from commit 60b2dbe67af4a919df0d1b802c1fe21909c48d4c)

src/rgw/rgw_rest.cc

index c30f4331b9d1c9267383f2194dcf82217efd2560..afd9bbdf708b484f4d208b134099684dfb75f6f0 100644 (file)
@@ -289,10 +289,11 @@ static bool str_ends_with_nocase(const string& s, const string& suffix, size_t *
     *pos = p;
   }
 
-  return boost::algorithm::iends_with(suffix, s);
+  return boost::algorithm::iends_with(s, suffix);
 }
 
-static bool rgw_find_host_in_domains(const string& host, string *domain, string *subdomain, set<string> valid_hostnames_set)
+static bool rgw_find_host_in_domains(const string& host, string *domain, string *subdomain,
+                                     const set<string>& valid_hostnames_set)
 {
   set<string>::iterator iter;
   /** TODO, Future optimization