From db57e575c97e06b0f0765f958073864b1729d085 Mon Sep 17 00:00:00 2001 From: Jeremy Harris Date: Tue, 5 Dec 2017 20:55:19 +0000 Subject: [PATCH] tidying --- src/src/acl.c | 2 +- src/src/parse.c | 8 +- src/src/smtp_in.c | 260 ++++++++++++++++++++++------------------------ src/src/verify.c | 12 +-- 4 files changed, 137 insertions(+), 145 deletions(-) diff --git a/src/src/acl.c b/src/src/acl.c index 739cd91ae..477b059a5 100644 --- a/src/src/acl.c +++ b/src/src/acl.c @@ -1702,7 +1702,7 @@ switch(vp->value) return csa_return_code[rc]; case VERIFY_HDR_SYNTAX: - /* Check that all relevant header lines have the correct syntax. If there is + /* Check that all relevant header lines have the correct 5322-syntax. If there is a syntax error, we return details of the error to the sender if configured to send out full details. (But a "message" setting on the ACL can override, as always). */ diff --git a/src/src/parse.c b/src/src/parse.c index 1b44146c5..74817454e 100644 --- a/src/src/parse.c +++ b/src/src/parse.c @@ -421,10 +421,10 @@ for (;;) if (*s == '\"') { *t++ = '\"'; - while ((c = *(++s)) != 0 && c != '\"') + while ((c = *++s) && c != '\"') { *t++ = c; - if (c == '\\' && s[1] != 0) *t++ = *(++s); + if (c == '\\' && s[1]) *t++ = *++s; } if (c == '\"') { @@ -443,7 +443,7 @@ for (;;) else while (!mac_iscntrl_or_special(*s) || *s == '\\') { c = *t++ = *s++; - if (c == '\\' && *s != 0) *t++ = *s++; + if (c == '\\' && *s) *t++ = *s++; } /* Terminate the word and skip subsequent comment */ @@ -638,7 +638,7 @@ RESTART: /* Come back here after passing a group name */ s = skip_comment(s); startptr = s; /* In case addr-spec */ s = read_local_part(s, t, errorptr, TRUE); /* Dot separated words */ -if (*errorptr != NULL) goto PARSE_FAILED; +if (*errorptr) goto PARSE_FAILED; /* If the terminator is neither < nor @ then the format of the address must either be a bare local-part (we are now at the end), or a phrase diff --git a/src/src/smtp_in.c b/src/src/smtp_in.c index 00e9d41a8..bf7a308db 100644 --- a/src/src/smtp_in.c +++ b/src/src/smtp_in.c @@ -682,10 +682,10 @@ void bdat_flush_data(void) { while (chunking_data_left) -{ + { unsigned n = chunking_data_left; (void) bdat_getbuf(&n); -} + } receive_getc = lwr_receive_getc; receive_getbuf = lwr_receive_getbuf; @@ -1646,27 +1646,27 @@ Returns: nothing void smtp_closedown(uschar *message) { -if (smtp_in == NULL || smtp_batched_input) return; +if (!smtp_in || smtp_batched_input) return; receive_swallow_smtp(); smtp_printf("421 %s\r\n", FALSE, message); for (;;) switch(smtp_read_command(FALSE, GETC_BUFFER_UNLIMITED)) { case EOF_CMD: - return; + return; case QUIT_CMD: - smtp_printf("221 %s closing connection\r\n", FALSE, smtp_active_hostname); - mac_smtp_fflush(); - return; + smtp_printf("221 %s closing connection\r\n", FALSE, smtp_active_hostname); + mac_smtp_fflush(); + return; case RSET_CMD: - smtp_printf("250 Reset OK\r\n", FALSE); - break; + smtp_printf("250 Reset OK\r\n", FALSE); + break; default: - smtp_printf("421 %s\r\n", FALSE, message); - break; + smtp_printf("421 %s\r\n", FALSE, message); + break; } } @@ -1755,7 +1755,7 @@ gstring * g = NULL; if (smtp_mailcmd_count > 0 || !LOGGING(smtp_no_mail)) return; -if (sender_host_authenticated != NULL) +if (sender_host_authenticated) { g = string_append(g, 2, US" A=", sender_host_authenticated); if (authenticated_id) g = string_append(g, 2, US":", authenticated_id); @@ -1847,7 +1847,7 @@ if (sender_helo_name != NULL) /* Skip tests if junk is permitted. */ if (!yield) - { + /* Allow the new standard form for IPv6 address literals, namely, [IPv6:....], and because someone is bound to use it, allow an equivalent IPv4 form. Allow plain addresses as well. */ @@ -1870,21 +1870,14 @@ if (!yield) /* Non-literals must be alpha, dot, hyphen, plus any non-valid chars that have been configured (usually underscore - sigh). */ - else if (*s != 0) - { - yield = TRUE; - while (*s != 0) - { + else if (*s) + for (yield = TRUE; *s; s++) if (!isalnum(*s) && *s != '.' && *s != '-' && Ustrchr(helo_allow_chars, *s) == NULL) { yield = FALSE; break; } - s++; - } - } - } /* Save argument if OK */ @@ -2117,14 +2110,14 @@ while (done <= 0) case HELO_CMD: case EHLO_CMD: - check_helo(smtp_cmd_data); - /* Fall through */ + check_helo(smtp_cmd_data); + /* Fall through */ case RSET_CMD: - cancel_cutthrough_connection(TRUE, US"RSET received"); - smtp_reset(reset_point); - bsmtp_transaction_linecount = receive_linecount; - break; + cancel_cutthrough_connection(TRUE, US"RSET received"); + smtp_reset(reset_point); + bsmtp_transaction_linecount = receive_linecount; + break; /* The MAIL FROM command requires an address as an operand. All we @@ -2134,53 +2127,53 @@ while (done <= 0) it is the canonical extracted address which is all that is kept. */ case MAIL_CMD: - smtp_mailcmd_count++; /* Count for no-mail log */ - if (sender_address != NULL) - /* The function moan_smtp_batch() does not return. */ - moan_smtp_batch(smtp_cmd_buffer, "503 Sender already given"); + smtp_mailcmd_count++; /* Count for no-mail log */ + if (sender_address != NULL) + /* The function moan_smtp_batch() does not return. */ + moan_smtp_batch(smtp_cmd_buffer, "503 Sender already given"); - if (smtp_cmd_data[0] == 0) - /* The function moan_smtp_batch() does not return. */ - moan_smtp_batch(smtp_cmd_buffer, "501 MAIL FROM must have an address operand"); + if (smtp_cmd_data[0] == 0) + /* The function moan_smtp_batch() does not return. */ + moan_smtp_batch(smtp_cmd_buffer, "501 MAIL FROM must have an address operand"); - /* Reset to start of message */ + /* Reset to start of message */ - cancel_cutthrough_connection(TRUE, US"MAIL received"); - smtp_reset(reset_point); + cancel_cutthrough_connection(TRUE, US"MAIL received"); + smtp_reset(reset_point); - /* Apply SMTP rewrite */ + /* Apply SMTP rewrite */ - raw_sender = ((rewrite_existflags & rewrite_smtp) != 0)? - rewrite_one(smtp_cmd_data, rewrite_smtp|rewrite_smtp_sender, NULL, FALSE, - US"", global_rewrite_rules) : smtp_cmd_data; + raw_sender = ((rewrite_existflags & rewrite_smtp) != 0)? + rewrite_one(smtp_cmd_data, rewrite_smtp|rewrite_smtp_sender, NULL, FALSE, + US"", global_rewrite_rules) : smtp_cmd_data; - /* Extract the address; the TRUE flag allows <> as valid */ + /* Extract the address; the TRUE flag allows <> as valid */ - raw_sender = - parse_extract_address(raw_sender, &errmess, &start, &end, &sender_domain, - TRUE); + raw_sender = + parse_extract_address(raw_sender, &errmess, &start, &end, &sender_domain, + TRUE); - if (raw_sender == NULL) - /* The function moan_smtp_batch() does not return. */ - moan_smtp_batch(smtp_cmd_buffer, "501 %s", errmess); + if (!raw_sender) + /* The function moan_smtp_batch() does not return. */ + moan_smtp_batch(smtp_cmd_buffer, "501 %s", errmess); - sender_address = string_copy(raw_sender); + sender_address = string_copy(raw_sender); - /* Qualify unqualified sender addresses if permitted to do so. */ + /* Qualify unqualified sender addresses if permitted to do so. */ - if (sender_domain == 0 && sender_address[0] != 0 && sender_address[0] != '@') - { - if (allow_unqualified_sender) - { - sender_address = rewrite_address_qualify(sender_address, FALSE); - DEBUG(D_receive) debug_printf("unqualified address %s accepted " - "and rewritten\n", raw_sender); - } - /* The function moan_smtp_batch() does not return. */ - else moan_smtp_batch(smtp_cmd_buffer, "501 sender address must contain " - "a domain"); - } - break; + if ( !sender_domain + && sender_address[0] != 0 && sender_address[0] != '@') + if (allow_unqualified_sender) + { + sender_address = rewrite_address_qualify(sender_address, FALSE); + DEBUG(D_receive) debug_printf("unqualified address %s accepted " + "and rewritten\n", raw_sender); + } + /* The function moan_smtp_batch() does not return. */ + else + moan_smtp_batch(smtp_cmd_buffer, "501 sender address must contain " + "a domain"); + break; /* The RCPT TO command requires an address as an operand. All we do @@ -2191,53 +2184,54 @@ while (done <= 0) extracted address. */ case RCPT_CMD: - if (sender_address == NULL) - /* The function moan_smtp_batch() does not return. */ - moan_smtp_batch(smtp_cmd_buffer, "503 No sender yet given"); + if (!sender_address) + /* The function moan_smtp_batch() does not return. */ + moan_smtp_batch(smtp_cmd_buffer, "503 No sender yet given"); - if (smtp_cmd_data[0] == 0) - /* The function moan_smtp_batch() does not return. */ - moan_smtp_batch(smtp_cmd_buffer, "501 RCPT TO must have an address operand"); + if (smtp_cmd_data[0] == 0) + /* The function moan_smtp_batch() does not return. */ + moan_smtp_batch(smtp_cmd_buffer, + "501 RCPT TO must have an address operand"); - /* Check maximum number allowed */ + /* Check maximum number allowed */ - if (recipients_max > 0 && recipients_count + 1 > recipients_max) - /* The function moan_smtp_batch() does not return. */ - moan_smtp_batch(smtp_cmd_buffer, "%s too many recipients", - recipients_max_reject? "552": "452"); + if (recipients_max > 0 && recipients_count + 1 > recipients_max) + /* The function moan_smtp_batch() does not return. */ + moan_smtp_batch(smtp_cmd_buffer, "%s too many recipients", + recipients_max_reject? "552": "452"); - /* Apply SMTP rewrite, then extract address. Don't allow "<>" as a - recipient address */ + /* Apply SMTP rewrite, then extract address. Don't allow "<>" as a + recipient address */ - recipient = rewrite_existflags & rewrite_smtp - ? rewrite_one(smtp_cmd_data, rewrite_smtp, NULL, FALSE, US"", - global_rewrite_rules) - : smtp_cmd_data; + recipient = rewrite_existflags & rewrite_smtp + ? rewrite_one(smtp_cmd_data, rewrite_smtp, NULL, FALSE, US"", + global_rewrite_rules) + : smtp_cmd_data; - recipient = parse_extract_address(recipient, &errmess, &start, &end, - &recipient_domain, FALSE); + recipient = parse_extract_address(recipient, &errmess, &start, &end, + &recipient_domain, FALSE); - if (!recipient) - /* The function moan_smtp_batch() does not return. */ - moan_smtp_batch(smtp_cmd_buffer, "501 %s", errmess); + if (!recipient) + /* The function moan_smtp_batch() does not return. */ + moan_smtp_batch(smtp_cmd_buffer, "501 %s", errmess); - /* If the recipient address is unqualified, qualify it if permitted. Then - add it to the list of recipients. */ + /* If the recipient address is unqualified, qualify it if permitted. Then + add it to the list of recipients. */ - if (recipient_domain == 0) - { - if (allow_unqualified_recipient) - { - DEBUG(D_receive) debug_printf("unqualified address %s accepted\n", - recipient); - recipient = rewrite_address_qualify(recipient, TRUE); - } - /* The function moan_smtp_batch() does not return. */ - else moan_smtp_batch(smtp_cmd_buffer, "501 recipient address must contain " - "a domain"); - } - receive_add_recipient(recipient, -1); - break; + if (!recipient_domain) + if (allow_unqualified_recipient) + { + DEBUG(D_receive) debug_printf("unqualified address %s accepted\n", + recipient); + recipient = rewrite_address_qualify(recipient, TRUE); + } + /* The function moan_smtp_batch() does not return. */ + else + moan_smtp_batch(smtp_cmd_buffer, + "501 recipient address must contain a domain"); + + receive_add_recipient(recipient, -1); + break; /* The DATA command is legal only if it follows successful MAIL FROM @@ -2245,22 +2239,20 @@ while (done <= 0) command is encountered. */ case DATA_CMD: - if (sender_address == NULL || recipients_count <= 0) - { - /* The function moan_smtp_batch() does not return. */ - if (sender_address == NULL) - moan_smtp_batch(smtp_cmd_buffer, - "503 MAIL FROM: command must precede DATA"); + if (!sender_address || recipients_count <= 0) + /* The function moan_smtp_batch() does not return. */ + if (!sender_address) + moan_smtp_batch(smtp_cmd_buffer, + "503 MAIL FROM: command must precede DATA"); + else + moan_smtp_batch(smtp_cmd_buffer, + "503 RCPT TO: must precede DATA"); else - moan_smtp_batch(smtp_cmd_buffer, - "503 RCPT TO: must precede DATA"); - } - else - { - done = 3; /* DATA successfully achieved */ - message_ended = END_NOTENDED; /* Indicate in middle of message */ - } - break; + { + done = 3; /* DATA successfully achieved */ + message_ended = END_NOTENDED; /* Indicate in middle of message */ + } + break; /* The VRFY, EXPN, HELP, ETRN, and NOOP commands are ignored. */ @@ -2270,32 +2262,32 @@ while (done <= 0) case HELP_CMD: case NOOP_CMD: case ETRN_CMD: - bsmtp_transaction_linecount = receive_linecount; - break; + bsmtp_transaction_linecount = receive_linecount; + break; case EOF_CMD: case QUIT_CMD: - done = 2; - break; + done = 2; + break; case BADARG_CMD: - /* The function moan_smtp_batch() does not return. */ - moan_smtp_batch(smtp_cmd_buffer, "501 Unexpected argument data"); - break; + /* The function moan_smtp_batch() does not return. */ + moan_smtp_batch(smtp_cmd_buffer, "501 Unexpected argument data"); + break; case BADCHAR_CMD: - /* The function moan_smtp_batch() does not return. */ - moan_smtp_batch(smtp_cmd_buffer, "501 Unexpected NULL in SMTP command"); - break; + /* The function moan_smtp_batch() does not return. */ + moan_smtp_batch(smtp_cmd_buffer, "501 Unexpected NULL in SMTP command"); + break; default: - /* The function moan_smtp_batch() does not return. */ - moan_smtp_batch(smtp_cmd_buffer, "500 Command unrecognized"); - break; + /* The function moan_smtp_batch() does not return. */ + moan_smtp_batch(smtp_cmd_buffer, "500 Command unrecognized"); + break; } } @@ -2445,7 +2437,7 @@ smtp_had_eof = smtp_had_error = 0; /* Set up the message size limit; this may be host-specific */ thismessage_size_limit = expand_string_integer(message_size_limit, TRUE); -if (expand_string_message != NULL) +if (expand_string_message) { if (thismessage_size_limit == -1) log_write(0, LOG_MAIN|LOG_PANIC, "unable to expand message_size_limit: " @@ -2896,7 +2888,7 @@ do /* At least once, in case we have an empty string */ int len; uschar *linebreak = Ustrchr(p, '\n'); ss = string_catn(ss, code, 3); - if (linebreak == NULL) + if (!linebreak) { len = Ustrlen(p); ss = string_catn(ss, US" ", 1); @@ -2910,9 +2902,9 @@ do /* At least once, in case we have an empty string */ ss = string_catn(ss, p, len); ss = string_catn(ss, US"\r\n", 2); p += len; - if (linebreak != NULL) p++; + if (linebreak) p++; } -while (*p != 0); +while (*p); /* Before we write the banner, check that there is no input pending, unless this synchronisation check is disabled. */ diff --git a/src/src/verify.c b/src/src/verify.c index b957c709b..e40a7fc27 100644 --- a/src/src/verify.c +++ b/src/src/verify.c @@ -2165,7 +2165,7 @@ return yield; *************************************************/ /* This function checks those header lines that contain addresses, and verifies -that all the addresses therein are syntactially correct. +that all the addresses therein are 5322-syntactially correct. Arguments: msgptr where to put an error message @@ -2181,7 +2181,7 @@ header_line *h; uschar *colon, *s; int yield = OK; -for (h = header_list; h != NULL && yield == OK; h = h->next) +for (h = header_list; h && yield == OK; h = h->next) { if (h->type != htype_from && h->type != htype_reply_to && @@ -2200,7 +2200,7 @@ for (h = header_list; h != NULL && yield == OK; h = h->next) parse_allow_group = TRUE; - while (*s != 0) + while (*s) { uschar *ss = parse_find_address_end(s, FALSE); uschar *recipient, *errmess; @@ -2217,7 +2217,7 @@ for (h = header_list; h != NULL && yield == OK; h = h->next) /* Permit an unqualified address only if the message is local, or if the sending host is configured to be permitted to send them. */ - if (recipient != NULL && domain == 0) + if (recipient && !domain) { if (h->type == htype_from || h->type == htype_sender) { @@ -2233,7 +2233,7 @@ for (h = header_list; h != NULL && yield == OK; h = h->next) /* It's an error if no address could be extracted, except for the special case of an empty address. */ - if (recipient == NULL && Ustrcmp(errmess, "empty address") != 0) + if (!recipient && Ustrcmp(errmess, "empty address") != 0) { uschar *verb = US"is"; uschar *t = ss; @@ -2271,7 +2271,7 @@ for (h = header_list; h != NULL && yield == OK; h = h->next) /* Advance to the next address */ - s = ss + (terminator? 1:0); + s = ss + (terminator ? 1 : 0); while (isspace(*s)) s++; } /* Next address */ -- 2.25.1