forked from pool/proftpd
9d1b4648b1
backport upstream feature include-in-limit-section OBS-URL: https://build.opensuse.org/request/show/454980 OBS-URL: https://build.opensuse.org/package/show/network/proftpd?expand=0&rev=43
48 lines
1.8 KiB
Diff
48 lines
1.8 KiB
Diff
Index: RELEASE_NOTES
|
|
===================================================================
|
|
--- RELEASE_NOTES.orig
|
|
+++ RELEASE_NOTES
|
|
@@ -12,6 +12,16 @@ ChangeLog files.
|
|
+ Fixed regression where all normal FTP users were handled as anonymous
|
|
users.
|
|
|
|
+ + Changed Configuration Directives
|
|
+
|
|
+ Include
|
|
+ The Include directive can now be used within a <Limit> section, e.g.:
|
|
+
|
|
+ <Limit LOGIN>
|
|
+ Include /path/to/allowed.txt
|
|
+ DenyAll
|
|
+ </Limit>
|
|
+
|
|
|
|
1.3.5c
|
|
---------
|
|
Index: doc/modules/mod_core.html
|
|
===================================================================
|
|
--- doc/modules/mod_core.html.orig
|
|
+++ doc/modules/mod_core.html
|
|
@@ -510,7 +510,7 @@ See also: <a href="#HideGroup"><code>Hid
|
|
<h2><a name="Include">Include</a></h2>
|
|
<strong>Syntax:</strong> Include <em>path|pattern</em><br>
|
|
<strong>Default:</strong> None<br>
|
|
-<strong>Context:</strong> server config, <code><VirtualHost></code>, <code><Global></code>, <code><Anonymous></code>, <code><Directory></code><br>
|
|
+<strong>Context:</strong> server config, <code><VirtualHost></code>, <code><Global></code>, <code><Anonymous></code>, <code><Limit></code>, <code><Directory></code><br>
|
|
<strong>Module:</strong> mod_core<br>
|
|
<strong>Compatibility:</strong> 1.2.10rc1 and later
|
|
|
|
Index: modules/mod_core.c
|
|
===================================================================
|
|
--- modules/mod_core.c.orig
|
|
+++ modules/mod_core.c
|
|
@@ -334,7 +334,7 @@ MODRET add_include(cmd_rec *cmd) {
|
|
int res;
|
|
|
|
CHECK_ARGS(cmd, 1);
|
|
- CHECK_CONF(cmd, CONF_ROOT|CONF_VIRTUAL|CONF_ANON|CONF_GLOBAL|CONF_DIR);
|
|
+ CHECK_CONF(cmd, CONF_ROOT|CONF_VIRTUAL|CONF_ANON|CONF_GLOBAL|CONF_LIMIT|CONF_DIR);
|
|
|
|
/* Make sure the given path is a valid path. */
|
|
|