[gnome-user-share/gnome-3-10] data: Fix httpd configuration with require_password=never

[Bastien Nocera <hadess src gnome org>]

commit 6c6aab294479ed1e4fe94c216538ea810e54a4bb
Author: Josselin Mouette <joss debian org>
Date:   Tue Jun 24 15:00:36 2014 +0200

    data: Fix httpd configuration with require_password=never
    
    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.

 data/dav_user_2.4.conf |   22 +++++++++++++++-------
 1 files changed, 15 insertions(+), 7 deletions(-)
---
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