archrelease: copy trunk to extra-x86_64
[arch-packages.git] / gnome-user-share / repos / extra-x86_64 / fix-no-password-mode.patch
blobd57e72b8d392781876af9bd68cb88e507507bc8e
1 From a1afc2e9aa3b86f408739e78bd23382c53df5b5c Mon Sep 17 00:00:00 2001
2 From: Josselin Mouette <joss@debian.org>
3 Date: Tue, 24 Jun 2014 15:00:36 +0200
4 Subject: data: Fix httpd configuration with require_password=never
5 MIME-Version: 1.0
6 Content-Type: text/plain; charset=UTF-8
7 Content-Transfer-Encoding: 8bit
9 The AuthType, AuthName, AuthDigestDomain, AuthDigestProvider,
10 AuthUserFile and AuthGroupFile directives should be in an
11 <IfDefine> section, executed only when password authentication
12 is configured, otherwise we get this error:
13 "AuthType configured with no corresponding authorization directives"
15 Thanks to scorpy_sk@yahoo.com and Arno Töll.
17 diff --git a/data/dav_user_2.4.conf b/data/dav_user_2.4.conf
18 index de2e885..9604637 100644
19 --- a/data/dav_user_2.4.conf
20 +++ b/data/dav_user_2.4.conf
21 @@ -30,20 +30,28 @@ DNSSDAutoRegisterUserDir Off
22 <Location />
23 DAV On
25 - AuthType Digest
26 - AuthName "${GUS_LOGIN_LABEL}"
27 - AuthDigestDomain /
28 + <IfDefine RequirePasswordAlways>
29 + AuthType Digest
30 + AuthName "${GUS_LOGIN_LABEL}"
31 + AuthDigestDomain /
33 - AuthDigestProvider file
34 - AuthUserFile ${XDG_CONFIG_HOME}/user-share/passwd
35 - AuthGroupFile /usr/share/gnome-user-share/dav_groupfile
36 + AuthDigestProvider file
37 + AuthUserFile ${XDG_CONFIG_HOME}/user-share/passwd
38 + AuthGroupFile /usr/share/gnome-user-share/dav_groupfile
40 - <IfDefine RequirePasswordAlways>
41 Require user guest
42 Require group guest
43 </IfDefine>
45 <IfDefine RequirePasswordOnWrite>
46 + AuthType Digest
47 + AuthName "${GUS_LOGIN_LABEL}"
48 + AuthDigestDomain /
50 + AuthDigestProvider file
51 + AuthUserFile ${XDG_CONFIG_HOME}/user-share/passwd
52 + AuthGroupFile /usr/share/gnome-user-share/dav_groupfile
54 <LimitExcept GET OPTIONS PROPFIND>
55 Require user guest
56 Require group guest
57 --
58 cgit v0.10.1