]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
rgw: change the swift auth config a bit
authorYehuda Sadeh <yehuda@hq.newdream.net>
Wed, 23 Mar 2011 19:07:25 +0000 (12:07 -0700)
committerYehuda Sadeh <yehuda@hq.newdream.net>
Wed, 23 Mar 2011 19:08:17 +0000 (12:08 -0700)
src/rgw/rgw_os_auth.cc

index ddbcc8cc05538b6c717e2882cc94ed20348c33d0..efb1526e5ceffdbac1a32485f95b7a257d8ef894 100644 (file)
@@ -168,8 +168,8 @@ void RGW_OS_Auth_Get::execute()
 
   const char *key = FCGX_GetParam("HTTP_X_AUTH_KEY", s->fcgx->envp);
   const char *user = FCGX_GetParam("HTTP_X_AUTH_USER", s->fcgx->envp);
-  const char *dns_name = FCGX_GetParam("RGW_DNS_NAME", s->fcgx->envp);
   const char *url_prefix = FCGX_GetParam("RGW_OPENSTACK_URL_PREFIX", s->fcgx->envp);
+  const char *os_url = FCGX_GetParam("RGW_OPENSTACK_URL", s->fcgx->envp);
 
   string user_str = user;
   string user_id;
@@ -189,7 +189,7 @@ void RGW_OS_Auth_Get::execute()
     goto done;
   }
 
-  CGI_PRINTF(s, "X-Storage-Url: http://%s/%s/v1\n", dns_name, url_prefix);
+  CGI_PRINTF(s, "X-Storage-Url: %s/%s/v1\n", os_url, url_prefix);
 
   if ((ret = encode_token(info.openstack_name, info.openstack_key, bl)) < 0)
     goto done;