forked from mirrors/tftp-hpa-google
Correct bug which caused "r" rules to get incorrectly rejected as "ri" rules
This commit is contained in:
parent
6299024e7a
commit
9630aae006
3 changed files with 8 additions and 2 deletions
5
CHANGES
5
CHANGES
|
@ -1,5 +1,10 @@
|
||||||
$Id$
|
$Id$
|
||||||
|
|
||||||
|
Changes in 0.40:
|
||||||
|
Fix bug which would cause "r" remapping rules to be
|
||||||
|
incorrectly rejected.
|
||||||
|
|
||||||
|
|
||||||
Changes in 0.39:
|
Changes in 0.39:
|
||||||
Support Perl-style \U...\E and \L...\E, as well as allow
|
Support Perl-style \U...\E and \L...\E, as well as allow
|
||||||
matching rules to be inverted (execute if rule *doesn't*
|
matching rules to be inverted (execute if rule *doesn't*
|
||||||
|
|
|
@ -234,7 +234,8 @@ static int parseline(char *line, struct rule *r, int lineno)
|
||||||
if ( !(r->rule_flags & RULE_REWRITE) )
|
if ( !(r->rule_flags & RULE_REWRITE) )
|
||||||
r->rule_flags &= ~RULE_GLOBAL;
|
r->rule_flags &= ~RULE_GLOBAL;
|
||||||
|
|
||||||
if ( r->rule_flags & (RULE_INVERSE|RULE_REWRITE) ) {
|
if ( (r->rule_flags & (RULE_INVERSE|RULE_REWRITE)) ==
|
||||||
|
(RULE_INVERSE|RULE_REWRITE) ) {
|
||||||
syslog(LOG_ERR, "r rules cannot be inverted, line %d: %s\n", lineno, line);
|
syslog(LOG_ERR, "r rules cannot be inverted, line %d: %s\n", lineno, line);
|
||||||
return -1; /* Error */
|
return -1; /* Error */
|
||||||
}
|
}
|
||||||
|
|
2
version
2
version
|
@ -1 +1 @@
|
||||||
0.39
|
0.40
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue