aboutsummaryrefslogtreecommitdiff
path: root/services/api
diff options
context:
space:
mode:
authorcash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>2009-11-07 22:36:23 +0000
committercash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>2009-11-07 22:36:23 +0000
commit963a9ab35f58f1f3ff5ca2822aed3b908717bb68 (patch)
treedecb98c4907ef12f03ab7a06d65d630c7ddb6078 /services/api
parent18acd536a3e1d39b4e05261bf87bb28da396b794 (diff)
downloadelgg-963a9ab35f58f1f3ff5ca2822aed3b908717bb68.tar.gz
elgg-963a9ab35f58f1f3ff5ca2822aed3b908717bb68.tar.bz2
combined the two different pams into one and fixed an issue with hmac authentication
git-svn-id: http://code.elgg.org/elgg/trunk@3635 36083f99-b078-4883-b0ff-0f9b5a30f544
Diffstat (limited to 'services/api')
-rw-r--r--services/api/rest.php6
1 files changed, 4 insertions, 2 deletions
diff --git a/services/api/rest.php b/services/api/rest.php
index 8ac63022d..4d3e39aaa 100644
--- a/services/api/rest.php
+++ b/services/api/rest.php
@@ -34,8 +34,10 @@ if (trigger_plugin_hook('rest', 'init', null, false) == false) {
// user token can also be used for user authentication
register_pam_handler('pam_auth_usertoken');
- // for api authentication, we default to a simple API key check
- register_api_auth_handler('api_auth_key');
+ // simple API key check
+ register_pam_handler('api_auth_key', "sufficient", "api");
+ // hmac
+ register_pam_handler('api_auth_hmac', "sufficient", "api");
}
// Get parameter variables