svn commit: r897531 - in /couchdb/trunk: etc/couchdb/default.ini.tpl.in src/couchdb/couch_server.erl

[jc...@apache.org]

Author: jchris
Date: Sat Jan  9 20:07:50 2010
New Revision: 897531

URL: http://svn.apache.org/viewvc?rev=897531&view=rev
Log:
make the default account db called _users, not users

Modified:
    couchdb/trunk/etc/couchdb/default.ini.tpl.in
    couchdb/trunk/src/couchdb/couch_server.erl

Modified: couchdb/trunk/etc/couchdb/default.ini.tpl.in
URL: http://svn.apache.org/viewvc/couchdb/trunk/etc/couchdb/default.ini.tpl.in?rev=897531&r1=897530&r2=897531&view=diff
==============================================================================
--- couchdb/trunk/etc/couchdb/default.ini.tpl.in (original)
+++ couchdb/trunk/etc/couchdb/default.ini.tpl.in Sat Jan  9 20:07:50 2010
@@ -25,7 +25,7 @@
 level = info
 
 [couch_httpd_auth]
-authentication_db = users
+authentication_db = _users
 require_valid_user = false
 
 [query_servers]

Modified: couchdb/trunk/src/couchdb/couch_server.erl
URL: http://svn.apache.org/viewvc/couchdb/trunk/src/couchdb/couch_server.erl?rev=897531&r1=897530&r2=897531&view=diff
==============================================================================
--- couchdb/trunk/src/couchdb/couch_server.erl (original)
+++ couchdb/trunk/src/couchdb/couch_server.erl Sat Jan  9 20:07:50 2010
@@ -74,7 +74,11 @@
 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.