You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by dc...@apache.org on 2014/08/18 17:46:04 UTC
[1/2] couchdb commit: updated refs/heads/1.6.x to 6acdb22
Repository: couchdb
Updated Branches:
refs/heads/1.6.x 59e4bdace -> 6acdb2203
hash admin passwords on startup when list
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/ed825d36
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/ed825d36
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/ed825d36
Branch: refs/heads/1.6.x
Commit: ed825d362ff237981ef15e4a28e326c79bd1367f
Parents: 59e4bda
Author: Robert Newson <rn...@apache.org>
Authored: Fri Jun 6 20:38:14 2014 +0100
Committer: Dave Cottlehuber <dc...@apache.org>
Committed: Mon Aug 18 17:44:32 2014 +0200
----------------------------------------------------------------------
src/couchdb/couch_passwords.erl | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/ed825d36/src/couchdb/couch_passwords.erl
----------------------------------------------------------------------
diff --git a/src/couchdb/couch_passwords.erl b/src/couchdb/couch_passwords.erl
index bbf6d9a..9abf31b 100644
--- a/src/couchdb/couch_passwords.erl
+++ b/src/couchdb/couch_passwords.erl
@@ -26,7 +26,9 @@ simple(Password, Salt) when is_binary(Password), is_binary(Salt) ->
?l2b(couch_util:to_hex(crypto:sha(<<Password/binary, Salt/binary>>))).
%% CouchDB utility functions
--spec hash_admin_password(binary()) -> binary().
+-spec hash_admin_password(binary() | list()) -> binary().
+hash_admin_password(ClearPassword) when is_list(ClearPassword) ->
+ hash_admin_password(?l2b(ClearPassword));
hash_admin_password(ClearPassword) when is_binary(ClearPassword) ->
Iterations = couch_config:get("couch_httpd_auth", "iterations", "10000"),
Salt = couch_uuids:random(),
[2/2] couchdb commit: updated refs/heads/1.6.x to 6acdb22
Posted by dc...@apache.org.
docs: include the right commit from the right branch
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/6acdb220
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/6acdb220
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/6acdb220
Branch: refs/heads/1.6.x
Commit: 6acdb2203e5b97030014d18ab1fa83d1e3828038
Parents: ed825d3
Author: Dave Cottlehuber <dc...@apache.org>
Authored: Mon Aug 18 17:45:45 2014 +0200
Committer: Dave Cottlehuber <dc...@apache.org>
Committed: Mon Aug 18 17:45:45 2014 +0200
----------------------------------------------------------------------
share/doc/src/whatsnew/1.6.rst | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/6acdb220/share/doc/src/whatsnew/1.6.rst
----------------------------------------------------------------------
diff --git a/share/doc/src/whatsnew/1.6.rst b/share/doc/src/whatsnew/1.6.rst
index a5f0e4e..a7bdd21 100644
--- a/share/doc/src/whatsnew/1.6.rst
+++ b/share/doc/src/whatsnew/1.6.rst
@@ -40,7 +40,7 @@ Version 1.6.1
bugfix release:
-* Hash admin passwords stored in ``local.ini`` on startup :commit:`d43f69d`.
+* Hash admin passwords stored in ``local.ini`` on startup :commit:`ed825d3`.
.. _release/1.6.0: