-------- Original-Nachricht --------
quoted text
> Datum: Tue, 17 Feb 2009 22:14:18 -0800
> Von: patrick keshishian <sidster@boxsoft.com>
> An: Olli Hauer <ohauer@gmx.de>
> CC: tech@openbsd.org
> Betreff: Re: allow comments and empty lines in spamd.alloweddomains

quoted text
> On Wed, Feb 18, 2009 at 07:03:19AM +0100, Olli Hauer wrote:
> > no, this is what I use, it also prevents a failure if someone has a
> trailing space after the mailaddress (allow entry)
> > 
> > Index: grey.c
> > ===================================================================
> > RCS file: /cvs/src/libexec/spamd/grey.c,v
> > retrieving revision 1.45
> > diff -u -r1.45 grey.c
> > --- grey.c  7 Dec 2008 21:12:52 -0000   1.45
> > +++ grey.c  18 Feb 2009 06:02:00 -0000
> > @@ -319,6 +319,18 @@
> >         SLIST_REMOVE_HEAD(&match_suffix, entry);
> >     if ((fp = fopen(alloweddomains_file, "r")) != NULL) {
> >         while ((buf = fgetln(fp, &len))) {
> > +           /* strip white space-characters */
> > +           while (len > 0 && isspace(buf[len-1]))
> > +               len--;
> > +           while (len > 0 && isspace(*buf)) {
> > +               buf++;
> > +               len--;
> > +           }
> > +           /* jump over comments and blank lines */
> > +           if (*buf == '#' || *buf == '\n')
> > +               continue;
> > +           if (len == 0)
> > +               continue;
> 
> 
> You should do your len check before the check for '#' and '\n'.
> 
> --patrick


you are right.


Index: grey.c
===================================================================
RCS file: /cvs/src/libexec/spamd/grey.c,v
retrieving revision 1.45
diff -u -r1.45 grey.c
--- grey.c  7 Dec 2008 21:12:52 -0000   1.45
+++ grey.c  18 Feb 2009 06:02:00 -0000
@@ -319,6 +319,18 @@
        SLIST_REMOVE_HEAD(&match_suffix, entry);
    if ((fp = fopen(alloweddomains_file, "r")) != NULL) {
        while ((buf = fgetln(fp, &len))) {
+           /* strip white space-characters */
+           while (len > 0 && isspace(buf[len-1]))
+               len--;
+           while (len > 0 && isspace(*buf)) {
+               buf++;
+               len--;
+           }
+           /* jump over comments and blank lines */
+           if (len == 0)
+               continue;
+           if (*buf == '#' || *buf == '\n')
+               continue;
            if (buf[len-1] == '\n')
                len--;
            if ((m = malloc(sizeof(struct mail_addr))) == NULL)

-- 
Jetzt 1 Monat kostenlos! GMX FreeDSL - Telefonanschluss + DSL 
f|r nur 17,95 Euro/mtl.!* http://dsl.gmx.de/?ac=OM.AD.PD003K11308T4569a