Re: [patch] smtpd: fix for ctype casts
Committed, thanks. - todd
Re: [patch] smtpd: fix for ctype casts
On Sun, 15 Mar 2020 16:09:36 +0100, Hiltjo Posthuma wrote: > Below is a patch which adds some missing casts: Looks good to me. - todd
Re: [patch] smtpd: fix for ctype casts
On Tue, Feb 25, 2020 at 12:09:19AM +0100, Joerg Jung wrote:
>
> > On 24. Feb 2020, at 20:31, Todd C. Miller wrote:
> >
> > I have a mostly-identical patch in my tree, though I tried to improve
> > readability a bit.
>
> ok jung@
>
> > - todd
> >
> > Index: usr.sbin/smtpd/mta_session.c
> > ===
> > RCS file: /cvs/src/usr.sbin/smtpd/mta_session.c,v
> > retrieving revision 1.132
> > diff -u -p -u -r1.132 mta_session.c
> > --- usr.sbin/smtpd/mta_session.c24 Feb 2020 16:16:07 - 1.132
> > +++ usr.sbin/smtpd/mta_session.c24 Feb 2020 18:19:22 -
> > @@ -1295,13 +1295,12 @@ mta_io(struct io *io, int evt, void *arg
> > if (s->replybuf[0] == '\0')
> > (void)strlcat(s->replybuf, line, sizeof
> > s->replybuf);
> > else if (len > 4) {
> > - line = line + 4;
> > - if (isdigit((int)*line) && *(line + 1) == '.' &&
> > - isdigit((int)*line+2) && *(line + 3) == '.'
> > &&
> > - isdigit((int)*line+4) &&
> > isspace((int)*(line + 5)))
> > - (void)strlcat(s->replybuf, line+5,
> > sizeof s->replybuf);
> > - else
> > - (void)strlcat(s->replybuf, line, sizeof
> > s->replybuf);
> > + p = line + 4;
> > + if (isdigit((unsigned char)p[0]) && p[1] == '.'
> > &&
> > + isdigit((unsigned char)p[2]) && p[3] == '.'
> > &&
> > + isdigit((unsigned char)p[4]) &&
> > isspace((unsigned char)p[5]))
> > + p += 5;
> > + (void)strlcat(s->replybuf, p, sizeof
> > s->replybuf);
> > }
> > goto nextline;
> > }
> > @@ -1313,9 +1312,9 @@ mta_io(struct io *io, int evt, void *arg
> > (void)strlcat(s->replybuf, line, sizeof s->replybuf);
> > else if (len > 4) {
> > p = line + 4;
> > - if (isdigit((int)*p) && *(p + 1) == '.' &&
> > - isdigit((int)*p+2) && *(p + 3) == '.' &&
> > - isdigit((int)*p+4) && isspace((int)*(p + 5)))
> > + if (isdigit((unsigned char)p[0]) && p[1] == '.' &&
> > + isdigit((unsigned char)p[2]) && p[3] == '.' &&
> > + isdigit((unsigned char)p[4]) && isspace((unsigned
> > char)p[5]))
> > p += 5;
> > if (strlcat(s->replybuf, p, sizeof s->replybuf) >=
> > sizeof s->replybuf)
> > (void)strlcpy(s->replybuf, line, sizeof
> > s->replybuf);
> > Index: usr.sbin/smtpd/parse.y
> > ===
> > RCS file: /cvs/src/usr.sbin/smtpd/parse.y,v
> > retrieving revision 1.276
> > diff -u -p -u -r1.276 parse.y
> > --- usr.sbin/smtpd/parse.y 3 Feb 2020 15:41:22 - 1.276
> > +++ usr.sbin/smtpd/parse.y 24 Feb 2020 18:19:51 -
> > @@ -529,7 +529,7 @@ SMTP LIMIT limits_smtp
> > free($3);
> > YYERROR;
> > }
> > - if (isspace((int)*$3) || !isprint((int)*$3) || *$3== '@') {
> > + if (isspace((unsigned char)*$3) || !isprint((unsigned char)*$3) || *$3
> > == '@') {
> > yyerror("sub-addr-delim uses invalid character");
> > free($3);
> > YYERROR;
> > Index: usr.sbin/smtpd/smtp_client.c
> > ===
> > RCS file: /cvs/src/usr.sbin/smtpd/smtp_client.c,v
> > retrieving revision 1.12
> > diff -u -p -u -r1.12 smtp_client.c
> > --- usr.sbin/smtpd/smtp_client.c10 Sep 2019 12:08:26 - 1.12
> > +++ usr.sbin/smtpd/smtp_client.c24 Feb 2020 18:21:43 -
> > @@ -779,9 +779,10 @@ smtp_client_replycat(struct smtp_client
> > line += 3;
> > if (line[0]) {
> > line += 1;
> > - if (isdigit((int)line[0]) && line[1] == '.' &&
> > - isdigit((int)line[2]) && line[3] == '.' &&
> > - isdigit((int)line[4]) && isspace((int)line[5]))
> > + if (isdigit((unsigned char)line[0]) && line[1] == '.' &&
> > + isdigit((unsigned char)line[2]) && line[3] == '.' &&
> > + isdigit((unsigned char)line[4]) &&
> > + isspace((unsigned char)line[5]))
> > line += 5;
> > }
> > } else
> > Index: usr.sbin/smtpd/util.c
> > ===
> > RCS file: /cvs/src/usr.sbin/smtpd/util.c,v
> > retrieving revision 1.150
> > diff -u -p -u -r1.150 util.c
> > --- usr.sbin/smtpd/util.c 3 Oct 2019
Re: [patch] smtpd: fix for ctype casts
I am much happier with the [] array derefs. I surprised this snuck in, time for a ctype re-audit of the entire tree
Re: [patch] smtpd: fix for ctype casts
> On 24. Feb 2020, at 20:31, Todd C. Miller wrote:
>
> I have a mostly-identical patch in my tree, though I tried to improve
> readability a bit.
ok jung@
> - todd
>
> Index: usr.sbin/smtpd/mta_session.c
> ===
> RCS file: /cvs/src/usr.sbin/smtpd/mta_session.c,v
> retrieving revision 1.132
> diff -u -p -u -r1.132 mta_session.c
> --- usr.sbin/smtpd/mta_session.c 24 Feb 2020 16:16:07 - 1.132
> +++ usr.sbin/smtpd/mta_session.c 24 Feb 2020 18:19:22 -
> @@ -1295,13 +1295,12 @@ mta_io(struct io *io, int evt, void *arg
> if (s->replybuf[0] == '\0')
> (void)strlcat(s->replybuf, line, sizeof
> s->replybuf);
> else if (len > 4) {
> - line = line + 4;
> - if (isdigit((int)*line) && *(line + 1) == '.' &&
> - isdigit((int)*line+2) && *(line + 3) == '.'
> &&
> - isdigit((int)*line+4) &&
> isspace((int)*(line + 5)))
> - (void)strlcat(s->replybuf, line+5,
> sizeof s->replybuf);
> - else
> - (void)strlcat(s->replybuf, line, sizeof
> s->replybuf);
> + p = line + 4;
> + if (isdigit((unsigned char)p[0]) && p[1] == '.'
> &&
> + isdigit((unsigned char)p[2]) && p[3] == '.'
> &&
> + isdigit((unsigned char)p[4]) &&
> isspace((unsigned char)p[5]))
> + p += 5;
> + (void)strlcat(s->replybuf, p, sizeof
> s->replybuf);
> }
> goto nextline;
> }
> @@ -1313,9 +1312,9 @@ mta_io(struct io *io, int evt, void *arg
> (void)strlcat(s->replybuf, line, sizeof s->replybuf);
> else if (len > 4) {
> p = line + 4;
> - if (isdigit((int)*p) && *(p + 1) == '.' &&
> - isdigit((int)*p+2) && *(p + 3) == '.' &&
> - isdigit((int)*p+4) && isspace((int)*(p + 5)))
> + if (isdigit((unsigned char)p[0]) && p[1] == '.' &&
> + isdigit((unsigned char)p[2]) && p[3] == '.' &&
> + isdigit((unsigned char)p[4]) && isspace((unsigned
> char)p[5]))
> p += 5;
> if (strlcat(s->replybuf, p, sizeof s->replybuf) >=
> sizeof s->replybuf)
> (void)strlcpy(s->replybuf, line, sizeof
> s->replybuf);
> Index: usr.sbin/smtpd/parse.y
> ===
> RCS file: /cvs/src/usr.sbin/smtpd/parse.y,v
> retrieving revision 1.276
> diff -u -p -u -r1.276 parse.y
> --- usr.sbin/smtpd/parse.y3 Feb 2020 15:41:22 - 1.276
> +++ usr.sbin/smtpd/parse.y24 Feb 2020 18:19:51 -
> @@ -529,7 +529,7 @@ SMTP LIMIT limits_smtp
> free($3);
> YYERROR;
> }
> - if (isspace((int)*$3) || !isprint((int)*$3) || *$3== '@') {
> + if (isspace((unsigned char)*$3) || !isprint((unsigned char)*$3) || *$3
> == '@') {
> yyerror("sub-addr-delim uses invalid character");
> free($3);
> YYERROR;
> Index: usr.sbin/smtpd/smtp_client.c
> ===
> RCS file: /cvs/src/usr.sbin/smtpd/smtp_client.c,v
> retrieving revision 1.12
> diff -u -p -u -r1.12 smtp_client.c
> --- usr.sbin/smtpd/smtp_client.c 10 Sep 2019 12:08:26 - 1.12
> +++ usr.sbin/smtpd/smtp_client.c 24 Feb 2020 18:21:43 -
> @@ -779,9 +779,10 @@ smtp_client_replycat(struct smtp_client
> line += 3;
> if (line[0]) {
> line += 1;
> - if (isdigit((int)line[0]) && line[1] == '.' &&
> - isdigit((int)line[2]) && line[3] == '.' &&
> - isdigit((int)line[4]) && isspace((int)line[5]))
> + if (isdigit((unsigned char)line[0]) && line[1] == '.' &&
> + isdigit((unsigned char)line[2]) && line[3] == '.' &&
> + isdigit((unsigned char)line[4]) &&
> + isspace((unsigned char)line[5]))
> line += 5;
> }
> } else
> Index: usr.sbin/smtpd/util.c
> ===
> RCS file: /cvs/src/usr.sbin/smtpd/util.c,v
> retrieving revision 1.150
> diff -u -p -u -r1.150 util.c
> --- usr.sbin/smtpd/util.c 3 Oct 2019 04:49:12 - 1.150
> +++ usr.sbin/smtpd/util.c 24 Feb 2020 19:17:12 -
> @@ -462,7 +462,7 @@ valid_domainpart(const char *s)
>
Re: [patch] smtpd: fix for ctype casts
I have a mostly-identical patch in my tree, though I tried to improve
readability a bit.
- todd
Index: usr.sbin/smtpd/mta_session.c
===
RCS file: /cvs/src/usr.sbin/smtpd/mta_session.c,v
retrieving revision 1.132
diff -u -p -u -r1.132 mta_session.c
--- usr.sbin/smtpd/mta_session.c24 Feb 2020 16:16:07 - 1.132
+++ usr.sbin/smtpd/mta_session.c24 Feb 2020 18:19:22 -
@@ -1295,13 +1295,12 @@ mta_io(struct io *io, int evt, void *arg
if (s->replybuf[0] == '\0')
(void)strlcat(s->replybuf, line, sizeof
s->replybuf);
else if (len > 4) {
- line = line + 4;
- if (isdigit((int)*line) && *(line + 1) == '.' &&
- isdigit((int)*line+2) && *(line + 3) == '.'
&&
- isdigit((int)*line+4) &&
isspace((int)*(line + 5)))
- (void)strlcat(s->replybuf, line+5,
sizeof s->replybuf);
- else
- (void)strlcat(s->replybuf, line, sizeof
s->replybuf);
+ p = line + 4;
+ if (isdigit((unsigned char)p[0]) && p[1] == '.'
&&
+ isdigit((unsigned char)p[2]) && p[3] == '.'
&&
+ isdigit((unsigned char)p[4]) &&
isspace((unsigned char)p[5]))
+ p += 5;
+ (void)strlcat(s->replybuf, p, sizeof
s->replybuf);
}
goto nextline;
}
@@ -1313,9 +1312,9 @@ mta_io(struct io *io, int evt, void *arg
(void)strlcat(s->replybuf, line, sizeof s->replybuf);
else if (len > 4) {
p = line + 4;
- if (isdigit((int)*p) && *(p + 1) == '.' &&
- isdigit((int)*p+2) && *(p + 3) == '.' &&
- isdigit((int)*p+4) && isspace((int)*(p + 5)))
+ if (isdigit((unsigned char)p[0]) && p[1] == '.' &&
+ isdigit((unsigned char)p[2]) && p[3] == '.' &&
+ isdigit((unsigned char)p[4]) && isspace((unsigned
char)p[5]))
p += 5;
if (strlcat(s->replybuf, p, sizeof s->replybuf) >=
sizeof s->replybuf)
(void)strlcpy(s->replybuf, line, sizeof
s->replybuf);
Index: usr.sbin/smtpd/parse.y
===
RCS file: /cvs/src/usr.sbin/smtpd/parse.y,v
retrieving revision 1.276
diff -u -p -u -r1.276 parse.y
--- usr.sbin/smtpd/parse.y 3 Feb 2020 15:41:22 - 1.276
+++ usr.sbin/smtpd/parse.y 24 Feb 2020 18:19:51 -
@@ -529,7 +529,7 @@ SMTP LIMIT limits_smtp
free($3);
YYERROR;
}
- if (isspace((int)*$3) || !isprint((int)*$3) || *$3== '@') {
+ if (isspace((unsigned char)*$3) || !isprint((unsigned char)*$3) || *$3
== '@') {
yyerror("sub-addr-delim uses invalid character");
free($3);
YYERROR;
Index: usr.sbin/smtpd/smtp_client.c
===
RCS file: /cvs/src/usr.sbin/smtpd/smtp_client.c,v
retrieving revision 1.12
diff -u -p -u -r1.12 smtp_client.c
--- usr.sbin/smtpd/smtp_client.c10 Sep 2019 12:08:26 - 1.12
+++ usr.sbin/smtpd/smtp_client.c24 Feb 2020 18:21:43 -
@@ -779,9 +779,10 @@ smtp_client_replycat(struct smtp_client
line += 3;
if (line[0]) {
line += 1;
- if (isdigit((int)line[0]) && line[1] == '.' &&
- isdigit((int)line[2]) && line[3] == '.' &&
- isdigit((int)line[4]) && isspace((int)line[5]))
+ if (isdigit((unsigned char)line[0]) && line[1] == '.' &&
+ isdigit((unsigned char)line[2]) && line[3] == '.' &&
+ isdigit((unsigned char)line[4]) &&
+ isspace((unsigned char)line[5]))
line += 5;
}
} else
Index: usr.sbin/smtpd/util.c
===
RCS file: /cvs/src/usr.sbin/smtpd/util.c,v
retrieving revision 1.150
diff -u -p -u -r1.150 util.c
--- usr.sbin/smtpd/util.c 3 Oct 2019 04:49:12 - 1.150
+++ usr.sbin/smtpd/util.c 24 Feb 2020 19:17:12 -
@@ -462,7 +462,7 @@ valid_domainpart(const char *s)
if (strlcpy(domain, p, sizeof domain) >= sizeof domain)
return 0;
- c = strchr(domain, (int)']');
+
Re: [patch] smtpd: fix for ctype casts
*ping*
Any feedback for the below patch is appreciated.
Thanks,
On Sat, Feb 01, 2020 at 05:01:48PM +0100, Hiltjo Posthuma wrote:
> Hi,
>
> This (pedantic) patch fixes a few casts for ctype functions/macros, like
> isspace, isalpha and isdigit.
>
> The isspace(3) man page says:
>
> "CAVEATS
> The argument c must be EOF or representable as an unsigned char;
> otherwise, the result is undefined."
>
>
> POSIX says:
>
> "The c argument is an int, the value of which the application shall ensure is
> a
> character representable as an unsigned char or equal to the value of the macro
> EOF. If the argument has any other value, the behavior is undefined."
>
> Reference:
> https://pubs.opengroup.org/onlinepubs/9699919799/functions/isspace.html
>
>
> In practise this might affect the portable version for NetBSD. I think most
> other implementations (OpenBSD, FreeBSD, Linux glibc, musl) (according to my
> testing) do an implicit cast already.
>
>
> To do a quick grep for similar cases:
> grep -E
> '(isalnum|isascii|isblank|iscntrl|isdigit|isgraph|islower|isprint|ispunct|isspace|isupper|isxdigit|tolower|toupper)'
> *.{c,h} | grep '(int'
>
>
> Patch below:
>
>
> diff --git usr.sbin/smtpd/mta_session.c usr.sbin/smtpd/mta_session.c
> index 9459d69275f..afd379b794c 100644
> --- usr.sbin/smtpd/mta_session.c
> +++ usr.sbin/smtpd/mta_session.c
> @@ -1296,9 +1296,9 @@ mta_io(struct io *io, int evt, void *arg)
> (void)strlcat(s->replybuf, line, sizeof
> s->replybuf);
> else {
> line = line + 4;
> - if (isdigit((int)*line) && *(line + 1) == '.' &&
> - isdigit((int)*line+2) && *(line + 3) == '.'
> &&
> - isdigit((int)*line+4) &&
> isspace((int)*(line + 5)))
> + if (isdigit((unsigned char)*line) && *(line +
> 1) == '.' &&
> + isdigit((unsigned char)*line+2) && *(line +
> 3) == '.' &&
> + isdigit((unsigned char)*line+4) &&
> isspace((unsigned char)*(line + 5)))
> (void)strlcat(s->replybuf, line+5,
> sizeof s->replybuf);
> else
> (void)strlcat(s->replybuf, line, sizeof
> s->replybuf);
> @@ -1311,9 +1311,9 @@ mta_io(struct io *io, int evt, void *arg)
>*/
> if (s->replybuf[0] != '\0') {
> p = line + 4;
> - if (isdigit((int)*p) && *(p + 1) == '.' &&
> - isdigit((int)*p+2) && *(p + 3) == '.' &&
> - isdigit((int)*p+4) && isspace((int)*(p + 5)))
> + if (isdigit((unsigned char)*p) && *(p + 1) == '.' &&
> + isdigit((unsigned char)*p+2) && *(p + 3) == '.' &&
> + isdigit((unsigned char)*p+4) && isspace((unsigned
> char)*(p + 5)))
> p += 5;
> if (strlcat(s->replybuf, p, sizeof s->replybuf) >=
> sizeof s->replybuf)
> (void)strlcpy(s->replybuf, line, sizeof
> s->replybuf);
> diff --git usr.sbin/smtpd/parse.y usr.sbin/smtpd/parse.y
> index eaa465ae83a..5cfd41092ee 100644
> --- usr.sbin/smtpd/parse.y
> +++ usr.sbin/smtpd/parse.y
> @@ -529,7 +529,7 @@ SMTP LIMIT limits_smtp
> free($3);
> YYERROR;
> }
> - if (isspace((int)*$3) || !isprint((int)*$3) || *$3== '@') {
> + if (isspace((unsigned char)*$3) || !isprint((unsigned char)*$3) ||
> *$3== '@') {
> yyerror("sub-addr-delim uses invalid character");
> free($3);
> YYERROR;
> diff --git usr.sbin/smtpd/smtp_client.c usr.sbin/smtpd/smtp_client.c
> index 22e798900cf..48ec3e1d8c7 100644
> --- usr.sbin/smtpd/smtp_client.c
> +++ usr.sbin/smtpd/smtp_client.c
> @@ -779,9 +779,9 @@ smtp_client_replycat(struct smtp_client *proto, const
> char *line)
> line += 3;
> if (line[0]) {
> line += 1;
> - if (isdigit((int)line[0]) && line[1] == '.' &&
> - isdigit((int)line[2]) && line[3] == '.' &&
> - isdigit((int)line[4]) && isspace((int)line[5]))
> + if (isdigit((unsigned char)line[0]) && line[1] == '.' &&
> + isdigit((unsigned char)line[2]) && line[3] == '.' &&
> + isdigit((unsigned char)line[4]) &&
> isspace((unsigned char)line[5]))
> line += 5;
> }
> } else
> diff --git usr.sbin/smtpd/util.c usr.sbin/smtpd/util.c
> index f59ad1e4690..77efe690336 100644
> --- usr.sbin/smtpd/util.c
> +++ usr.sbin/smtpd/util.c
> @@ -489,7 +489,7 @@ valid_domainpart(const char *s)
> return res_hnok(s);
> }
>
> -#define LABELCHR(c) ((c) == '-' ||
[patch] smtpd: fix for ctype casts
Hi,
This (pedantic) patch fixes a few casts for ctype functions/macros, like
isspace, isalpha and isdigit.
The isspace(3) man page says:
"CAVEATS
The argument c must be EOF or representable as an unsigned char;
otherwise, the result is undefined."
POSIX says:
"The c argument is an int, the value of which the application shall ensure is a
character representable as an unsigned char or equal to the value of the macro
EOF. If the argument has any other value, the behavior is undefined."
Reference:
https://pubs.opengroup.org/onlinepubs/9699919799/functions/isspace.html
In practise this might affect the portable version for NetBSD. I think most
other implementations (OpenBSD, FreeBSD, Linux glibc, musl) (according to my
testing) do an implicit cast already.
To do a quick grep for similar cases:
grep -E
'(isalnum|isascii|isblank|iscntrl|isdigit|isgraph|islower|isprint|ispunct|isspace|isupper|isxdigit|tolower|toupper)'
*.{c,h} | grep '(int'
Patch below:
diff --git usr.sbin/smtpd/mta_session.c usr.sbin/smtpd/mta_session.c
index 9459d69275f..afd379b794c 100644
--- usr.sbin/smtpd/mta_session.c
+++ usr.sbin/smtpd/mta_session.c
@@ -1296,9 +1296,9 @@ mta_io(struct io *io, int evt, void *arg)
(void)strlcat(s->replybuf, line, sizeof
s->replybuf);
else {
line = line + 4;
- if (isdigit((int)*line) && *(line + 1) == '.' &&
- isdigit((int)*line+2) && *(line + 3) == '.'
&&
- isdigit((int)*line+4) &&
isspace((int)*(line + 5)))
+ if (isdigit((unsigned char)*line) && *(line +
1) == '.' &&
+ isdigit((unsigned char)*line+2) && *(line +
3) == '.' &&
+ isdigit((unsigned char)*line+4) &&
isspace((unsigned char)*(line + 5)))
(void)strlcat(s->replybuf, line+5,
sizeof s->replybuf);
else
(void)strlcat(s->replybuf, line, sizeof
s->replybuf);
@@ -1311,9 +1311,9 @@ mta_io(struct io *io, int evt, void *arg)
*/
if (s->replybuf[0] != '\0') {
p = line + 4;
- if (isdigit((int)*p) && *(p + 1) == '.' &&
- isdigit((int)*p+2) && *(p + 3) == '.' &&
- isdigit((int)*p+4) && isspace((int)*(p + 5)))
+ if (isdigit((unsigned char)*p) && *(p + 1) == '.' &&
+ isdigit((unsigned char)*p+2) && *(p + 3) == '.' &&
+ isdigit((unsigned char)*p+4) && isspace((unsigned
char)*(p + 5)))
p += 5;
if (strlcat(s->replybuf, p, sizeof s->replybuf) >=
sizeof s->replybuf)
(void)strlcpy(s->replybuf, line, sizeof
s->replybuf);
diff --git usr.sbin/smtpd/parse.y usr.sbin/smtpd/parse.y
index eaa465ae83a..5cfd41092ee 100644
--- usr.sbin/smtpd/parse.y
+++ usr.sbin/smtpd/parse.y
@@ -529,7 +529,7 @@ SMTP LIMIT limits_smtp
free($3);
YYERROR;
}
- if (isspace((int)*$3) || !isprint((int)*$3) || *$3== '@') {
+ if (isspace((unsigned char)*$3) || !isprint((unsigned char)*$3) ||
*$3== '@') {
yyerror("sub-addr-delim uses invalid character");
free($3);
YYERROR;
diff --git usr.sbin/smtpd/smtp_client.c usr.sbin/smtpd/smtp_client.c
index 22e798900cf..48ec3e1d8c7 100644
--- usr.sbin/smtpd/smtp_client.c
+++ usr.sbin/smtpd/smtp_client.c
@@ -779,9 +779,9 @@ smtp_client_replycat(struct smtp_client *proto, const char
*line)
line += 3;
if (line[0]) {
line += 1;
- if (isdigit((int)line[0]) && line[1] == '.' &&
- isdigit((int)line[2]) && line[3] == '.' &&
- isdigit((int)line[4]) && isspace((int)line[5]))
+ if (isdigit((unsigned char)line[0]) && line[1] == '.' &&
+ isdigit((unsigned char)line[2]) && line[3] == '.' &&
+ isdigit((unsigned char)line[4]) &&
isspace((unsigned char)line[5]))
line += 5;
}
} else
diff --git usr.sbin/smtpd/util.c usr.sbin/smtpd/util.c
index f59ad1e4690..77efe690336 100644
--- usr.sbin/smtpd/util.c
+++ usr.sbin/smtpd/util.c
@@ -489,7 +489,7 @@ valid_domainpart(const char *s)
return res_hnok(s);
}
-#define LABELCHR(c) ((c) == '-' || (c) == '_' || isalpha((int)(c)) ||
isdigit((int)(c)))
+#define LABELCHR(c) ((c) == '-' || (c) == '_' || isalpha((unsigned char)(c))
|| isdigit((unsigned char)(c)))
#define LABELMAX 63
#define DNAMEMAX 253
--
Kind regards,
Hiltjo
