You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by rn...@apache.org on 2016/09/10 09:13:11 UTC
couch commit: updated refs/heads/master to 100241c
Repository: couchdb-couch
Updated Branches:
refs/heads/master 092dec86b -> 100241c18
Fix unused variables warning
UserCtx was available here in the past so we could upgrade password
hashes when authenticating. In the clustered case we found this to be
messy as multiple attempts to upgrade the same document would occur
close together. For 2.0, we elected to remove this upgrade-on-auth
path.
Project: http://git-wip-us.apache.org/repos/asf/couchdb-couch/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-couch/commit/100241c1
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-couch/tree/100241c1
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-couch/diff/100241c1
Branch: refs/heads/master
Commit: 100241c182e9af1f7fe05046c3f9e0e87c7b64e4
Parents: 092dec8
Author: Robert Newson <rn...@apache.org>
Authored: Sat Sep 10 10:03:54 2016 +0100
Committer: Robert Newson <rn...@apache.org>
Committed: Sat Sep 10 10:03:54 2016 +0100
----------------------------------------------------------------------
src/couch_httpd_auth.erl | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-couch/blob/100241c1/src/couch_httpd_auth.erl
----------------------------------------------------------------------
diff --git a/src/couch_httpd_auth.erl b/src/couch_httpd_auth.erl
index 15d3ac6..ec7ede1 100644
--- a/src/couch_httpd_auth.erl
+++ b/src/couch_httpd_auth.erl
@@ -91,7 +91,7 @@ default_authentication_handler(Req, AuthModule) ->
case AuthModule:get_user_creds(Req, User) of
nil ->
throw({unauthorized, <<"Name or password is incorrect.">>});
- {ok, UserProps, AuthCtx} ->
+ {ok, UserProps, _AuthCtx} ->
reject_if_totp(UserProps),
UserName = ?l2b(User),
Password = ?l2b(Pass),
@@ -298,7 +298,7 @@ handle_session_req(#httpd{method='POST', mochi_req=MochiReq}=Req, AuthModule) ->
UserName = ?l2b(extract_username(Form)),
Password = ?l2b(couch_util:get_value("password", Form, "")),
couch_log:debug("Attempt Login: ~s",[UserName]),
- {ok, UserProps, AuthCtx} = case AuthModule:get_user_creds(Req, UserName) of
+ {ok, UserProps, _AuthCtx} = case AuthModule:get_user_creds(Req, UserName) of
nil -> {ok, [], nil};
Result -> Result
end,