4 files changed, 9 insertions, 7 deletions
diff --git a/sca-cpp/trunk/modules/oauth/mod-oauth1.cpp b/sca-cpp/trunk/modules/oauth/mod-oauth1.cpp
index b927315393..eb23443491 100644
--- a/sca-cpp/trunk/modules/oauth/mod-oauth1.cpp
+++ b/sca-cpp/trunk/modules/oauth/mod-oauth1.cpp
@@ -235,7 +235,7 @@ const failable<int> authorize(const list<list<value> >& args, request_rec* r, co
     // Store the request token in memcached
     const failable<bool> prc = memcache::put(mklist<value>("tuscanyOAuth1Token", cadr(tv)), cadr(sv), mc);
     if (!hasContent(prc))
-        return mkfailure<int>(reason(prc));
+        return mkfailure<int>(prc);
 
     // Redirect to the authorize URI
     const string authuri = httpd::unescape(cadr(auth)) + string("?") + http::queryString(mklist<list<value> >(tv));
@@ -327,7 +327,7 @@ const failable<int> accessToken(const list<list<value> >& args, request_rec* r,
     // Retrieve the request token from memcached
     const failable<value> sv = memcache::get(mklist<value>("tuscanyOAuth1Token", cadr(tv)), mc);
     if (!hasContent(sv))
-        return mkfailure<int>(reason(sv));
+        return mkfailure<int>(sv);
 
     // Build and sign access token request URI
     const string tokuri = httpd::unescape(cadr(tok)) + string("?") + http::queryString(mklist<list<value> >(vv));
@@ -374,13 +374,13 @@ const failable<int> accessToken(const list<list<value> >& args, request_rec* r,
     // Retrieve the user info from the profile
     const failable<list<value> > iv = profileUserInfo(cadr(cid), profres);
     if (!hasContent(iv))
-        return mkfailure<int>(reason(iv));
+        return mkfailure<int>(iv);
 
     // Store user info in memcached keyed by session ID
     const value sid = string("OAuth1_") + mkrand();
     const failable<bool> prc = memcache::put(mklist<value>("tuscanyOAuth1", sid), content(iv), mc);
     if (!hasContent(prc))
-        return mkfailure<int>(reason(prc));
+        return mkfailure<int>(prc);
 
     // Send session ID to the client in a cookie
     debug(c_str(openauth::cookie("TuscanyOAuth1", sid, httpd::hostName(r))), "modoauth1::access_token::setcookie");
diff --git a/sca-cpp/trunk/modules/oauth/mod-oauth2.cpp b/sca-cpp/trunk/modules/oauth/mod-oauth2.cpp
index 05ad77d646..cbece191aa 100644
--- a/sca-cpp/trunk/modules/oauth/mod-oauth2.cpp
+++ b/sca-cpp/trunk/modules/oauth/mod-oauth2.cpp
@@ -222,7 +222,7 @@ const failable<int> accessToken(const list<list<value> >& args, request_rec* r,
     const value tval = mklist<value>(string("application/x-www-form-urlencoded;charset=UTF-8"), mklist<value>(tqs));
     const failable<value> ftr = http::post(tval, turi, *(cs));
     if (!hasContent(ftr))
-        return mkfailure<int>(reason(ftr));
+        return mkfailure<int>(ftr);
     const value tr = content(ftr);
     debug(tr, "modoauth2::access_token::response");
     if (!isList(tr) || isNil(tr))
@@ -247,13 +247,13 @@ const failable<int> accessToken(const list<list<value> >& args, request_rec* r,
     // Retrieve the user info from the profile
     const failable<list<value> > iv = profileUserInfo(cadr(cid), content(profres));
     if (!hasContent(iv))
-        return mkfailure<int>(reason(iv));
+        return mkfailure<int>(iv);
 
     // Store user info in memcached keyed by session ID
     const value sid = string("OAuth2_") + mkrand();
     const failable<bool> prc = memcache::put(mklist<value>("tuscanyOAuth2", sid), content(iv), mc);
     if (!hasContent(prc))
-        return mkfailure<int>(reason(prc));
+        return mkfailure<int>(prc);
 
     // Send session ID to the client in a cookie
     debug(c_str(openauth::cookie("TuscanyOAuth2", sid, httpd::hostName(r))), "modoauth2::access_token::setcookie");
diff --git a/sca-cpp/trunk/modules/oauth/start-mixed-test b/sca-cpp/trunk/modules/oauth/start-mixed-test
index 11bba42ef0..e5a8837354 100755
--- a/sca-cpp/trunk/modules/oauth/start-mixed-test
+++ b/sca-cpp/trunk/modules/oauth/start-mixed-test
@@ -24,6 +24,7 @@
 here=`echo "import os; print os.path.realpath('$0')" | python`; here=`dirname $here`
 
 # Setup
+rm -rf tmp
 ../../components/cache/memcached-start tmp 11212
 ../../components/cache/memcached-start tmp 11213
 
diff --git a/sca-cpp/trunk/modules/oauth/start-test b/sca-cpp/trunk/modules/oauth/start-test
index 21e1e005bd..8fc41cdb9a 100755
--- a/sca-cpp/trunk/modules/oauth/start-test
+++ b/sca-cpp/trunk/modules/oauth/start-test
@@ -21,6 +21,7 @@
 # 127.0.0.1 www.example.com
 
 # Setup
+rm -rf tmp
 #../../ubuntu/ip-redirect-all 80 8090
 #../../ubuntu/ip-redirect-all 443 8453