masqmail-0.2
changeset 115:315773f814f7
allow `:' unquoted too; updated masqmail.conf.5 (Thanks to Paolo)
rvalues with colons were probably already read correctly although unquoted
author | meillo@marmaro.de |
---|---|
date | Wed, 30 Jun 2010 15:31:42 +0200 |
parents | a80ebfa16cd5 |
children | ddc8041fdee1 |
files | man/masqmail.conf.5 src/conf.c |
diffstat | 2 files changed, 4 insertions(+), 3 deletions(-) [+] |
line diff
1.1 --- a/man/masqmail.conf.5 Wed Jun 30 15:00:59 2010 +0200 1.2 +++ b/man/masqmail.conf.5 Wed Jun 30 15:31:42 2010 +0200 1.3 @@ -1,4 +1,4 @@ 1.4 -.TH masqmail.conf 5 2010-06-21 masqmail-0.2.24 "File Formats" 1.5 +.TH masqmail.conf 5 2010-06-30 masqmail-0.2.25 "File Formats" 1.6 1.7 .SH NAME 1.8 masqmail.conf \- masqmail configuration file 1.9 @@ -16,7 +16,7 @@ 1.10 Where \fBval\fR is a variable name and \fIexpression\fR a string, 1.11 which can be quoted with double quotes `"'. 1.12 If the expression is on multiple lines or contains characters other than letters, 1.13 -digits or the characters `.', `-', `_', `/', it must be quoted. 1.14 +digits or the characters `.', `-', `_', `/', ';', '@', ':' it must be quoted. 1.15 You can use quotes inside quotes by escaping them with a backslash. 1.16 1.17 Each val has a type, which can be boolean, numeric, string or list.
2.1 --- a/src/conf.c Wed Jun 30 15:00:59 2010 +0200 2.2 +++ b/src/conf.c Wed Jun 30 15:31:42 2010 +0200 2.3 @@ -358,7 +358,8 @@ 2.4 2.5 c = fgetc(in); 2.6 if (c != '\"') { 2.7 - while ((isalnum(c) || c == '_' || c == '-' || c == '.' || c == '/' || c == '@' || c == ';') 2.8 + while ((isalnum(c) || c == '_' || c == '-' || c == '.' 2.9 + || c == '/' || c == '@' || c == ';' || c == ':') 2.10 && (ptr < buf + size - 1) 2.11 && (c != EOF)) { 2.12 *ptr = c;