From: Yehuda Sadeh <yehuda@inktank.com>
Date: Sat, 8 Feb 2014 01:00:07 +0000 (-0800)
Subject: dencoder: fix for new rgw manifest code
X-Git-Tag: v0.78~161^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=197544137eebf4948b8f2363a4efef3b07bf8028;p=ceph.git

dencoder: fix for new rgw manifest code

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

diff --git a/src/rgw/rgw_dencoder.cc b/src/rgw/rgw_dencoder.cc
index b5c49425f89a..2c8c758a6422 100644
--- a/src/rgw/rgw_dencoder.cc
+++ b/src/rgw/rgw_dencoder.cc
@@ -95,16 +95,6 @@ void ACLGranteeType::generate_test_instances(list<ACLGranteeType*>& o)
 static string rgw_uri_all_users = RGW_URI_ALL_USERS;
 static string rgw_uri_auth_users = RGW_URI_AUTH_USERS;
 
-ACLGroupTypeEnum ACLGrant_S3::uri_to_group(string& uri)
-{
-  if (uri.compare(rgw_uri_all_users) == 0)
-    return ACL_GROUP_ALL_USERS;
-  else if (uri.compare(rgw_uri_auth_users) == 0)
-    return ACL_GROUP_AUTHENTICATED_USERS;
-
-  return ACL_GROUP_NONE;
-}
-
 void ACLGrant::generate_test_instances(list<ACLGrant*>& o)
 {
   string id, name, email;
diff --git a/src/test/Makefile.am b/src/test/Makefile.am
index 39c9604de48e..f6f739b5ab9f 100644
--- a/src/test/Makefile.am
+++ b/src/test/Makefile.am
@@ -51,7 +51,7 @@ ceph_dencoder_SOURCES = \
 	test/encoding/ceph_dencoder.cc \
 	$(DENCODER_SOURCES)
 ceph_dencoder_LDADD = \
-	$(LIBOSD) $(LIBMDS) $(LIBMON) \
+	$(LIBOSD) $(LIBMDS) $(LIBMON) $(LIBRGW) $(LIBRGW_DEPS) \
 	$(DENCODER_DEPS) $(CEPH_GLOBAL)
 
 # These should always use explicit _CFLAGS/_CXXFLAGS so avoid basename conflicts