# HG changeset patch # User meillo@marmaro.de # Date 1277904702 -7200 # Node ID 315773f814f7b31a92f33289613641de939eab33 # Parent a80ebfa16cd5a558bd84cc68d5eebb9333bf26a5 allow `:' unquoted too; updated masqmail.conf.5 (Thanks to Paolo) rvalues with colons were probably already read correctly although unquoted diff -r a80ebfa16cd5 -r 315773f814f7 man/masqmail.conf.5 --- a/man/masqmail.conf.5 Wed Jun 30 15:00:59 2010 +0200 +++ b/man/masqmail.conf.5 Wed Jun 30 15:31:42 2010 +0200 @@ -1,4 +1,4 @@ -.TH masqmail.conf 5 2010-06-21 masqmail-0.2.24 "File Formats" +.TH masqmail.conf 5 2010-06-30 masqmail-0.2.25 "File Formats" .SH NAME masqmail.conf \- masqmail configuration file @@ -16,7 +16,7 @@ Where \fBval\fR is a variable name and \fIexpression\fR a string, which can be quoted with double quotes `"'. If the expression is on multiple lines or contains characters other than letters, -digits or the characters `.', `-', `_', `/', it must be quoted. +digits or the characters `.', `-', `_', `/', ';', '@', ':' it must be quoted. You can use quotes inside quotes by escaping them with a backslash. Each val has a type, which can be boolean, numeric, string or list. diff -r a80ebfa16cd5 -r 315773f814f7 src/conf.c --- a/src/conf.c Wed Jun 30 15:00:59 2010 +0200 +++ b/src/conf.c Wed Jun 30 15:31:42 2010 +0200 @@ -358,7 +358,8 @@ c = fgetc(in); if (c != '\"') { - while ((isalnum(c) || c == '_' || c == '-' || c == '.' || c == '/' || c == '@' || c == ';') + while ((isalnum(c) || c == '_' || c == '-' || c == '.' + || c == '/' || c == '@' || c == ';' || c == ':') && (ptr < buf + size - 1) && (c != EOF)) { *ptr = c;