iilyak commented on a change in pull request #3568:
URL: https://github.com/apache/couchdb/pull/3568#discussion_r635168075



##########
File path: src/chttpd/src/chttpd_auth_cache.erl
##########
@@ -308,15 +325,20 @@ maybe_validate_user_creds(nil) ->
 % throws if UserCreds includes a _conflicts member
 % returns UserCreds otherwise
 maybe_validate_user_creds(UserCreds) ->
-    AllowConflictedUserDocs = config:get_boolean("chttpd_auth", 
"allow_conflicted_user_docs", false),
+    AllowConflictedUserDocs = config:get_boolean(
+        "chttpd_auth",
+        "allow_conflicted_user_docs",
+        false
+    ),
     case {couch_util:get_value(<<"_conflicts">>, UserCreds), 
AllowConflictedUserDocs} of
         {undefined, _} ->
             {ok, UserCreds, nil};
         {_, true} ->
             {ok, UserCreds, nil};
         {_ConflictList, false} ->
-            throw({unauthorized,
-                <<"User document conflicts must be resolved before the 
document",
-                  " is used for authentication purposes.">>
-            })
+            throw(
+                {unauthorized,

Review comment:
       +1




-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
[email protected]


Reply via email to