From a1afc2e9aa3b86f408739e78bd23382c53df5b5c Mon Sep 17 00:00:00 2001
From: Josselin Mouette <joss@debian.org>
Date: Tue, 24 Jun 2014 15:00:36 +0200
Subject: data: Fix httpd configuration with require_password=never
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The AuthType, AuthName, AuthDigestDomain, AuthDigestProvider,
AuthUserFile and AuthGroupFile directives should be in an
<IfDefine> section, executed only when password authentication
is configured, otherwise we get this error:
"AuthType configured with no corresponding authorization directives"

Thanks to scorpy_sk@yahoo.com and Arno Töll.

diff --git a/data/dav_user_2.4.conf b/data/dav_user_2.4.conf
index de2e885..9604637 100644
--- a/data/dav_user_2.4.conf
+++ b/data/dav_user_2.4.conf
@@ -30,20 +30,28 @@ DNSSDAutoRegisterUserDir Off
   <Location />
     DAV On
 
-    AuthType Digest
-    AuthName "${GUS_LOGIN_LABEL}"
-    AuthDigestDomain /
+    <IfDefine RequirePasswordAlways>
+      AuthType Digest
+      AuthName "${GUS_LOGIN_LABEL}"
+      AuthDigestDomain /
 
-    AuthDigestProvider file
-    AuthUserFile ${XDG_CONFIG_HOME}/user-share/passwd
-    AuthGroupFile /usr/share/gnome-user-share/dav_groupfile
+      AuthDigestProvider file
+      AuthUserFile ${XDG_CONFIG_HOME}/user-share/passwd
+      AuthGroupFile /usr/share/gnome-user-share/dav_groupfile
 
-    <IfDefine RequirePasswordAlways>
       Require user guest
       Require group guest
     </IfDefine>
 
     <IfDefine RequirePasswordOnWrite>
+      AuthType Digest
+      AuthName "${GUS_LOGIN_LABEL}"
+      AuthDigestDomain /
+
+      AuthDigestProvider file
+      AuthUserFile ${XDG_CONFIG_HOME}/user-share/passwd
+      AuthGroupFile /usr/share/gnome-user-share/dav_groupfile
+
       <LimitExcept GET OPTIONS PROPFIND>
         Require user guest
         Require group guest
-- 
cgit v0.10.1