summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--etc/couchdb/default.ini.tpl.in2
-rw-r--r--src/couchdb/couch_server.erl6
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.