diff options
| author | John Christopher Anderson <jchris@apache.org> | 2010-01-09 20:07:50 +0000 |
|---|---|---|
| committer | John Christopher Anderson <jchris@apache.org> | 2010-01-09 20:07:50 +0000 |
| commit | 84fd4ae77ef7b4c53a9159394747676a1c65ab51 (patch) | |
| tree | c8a11f4cb09bf89c2108ddaf104a7e88909d14f9 | |
| parent | a4d7386889ac73a69592a9c4b4e26f6c44b8e46f (diff) | |
make the default account db called _users, not users
git-svn-id: https://svn.apache.org/repos/asf/couchdb/trunk@897531 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | etc/couchdb/default.ini.tpl.in | 2 | ||||
| -rw-r--r-- | src/couchdb/couch_server.erl | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/etc/couchdb/default.ini.tpl.in b/etc/couchdb/default.ini.tpl.in index f490eb97..609d48f1 100644 --- a/etc/couchdb/default.ini.tpl.in +++ b/etc/couchdb/default.ini.tpl.in @@ -25,7 +25,7 @@ file = %localstatelogdir%/couch.log level = info [couch_httpd_auth] -authentication_db = users +authentication_db = _users require_valid_user = false [query_servers] diff --git a/src/couchdb/couch_server.erl b/src/couchdb/couch_server.erl index afdf9365..325d4a12 100644 --- a/src/couchdb/couch_server.erl +++ b/src/couchdb/couch_server.erl @@ -74,7 +74,11 @@ delete(DbName, Options) -> check_dbname(#server{dbname_regexp=RegExp}, DbName) -> case re:run(DbName, RegExp, [{capture, none}]) of nomatch -> - {error, illegal_database_name}; + case DbName of + "_users" -> ok; + _Else -> + {error, illegal_database_name} + end; match -> ok end. |