diff options
| -rw-r--r-- | src/src/acl.c | 4 | ||||
| -rw-r--r-- | src/src/expand.c | 17 | ||||
| -rw-r--r-- | src/src/receive.c | 5 | ||||
| -rw-r--r-- | src/src/smtp_in.c | 2 |
4 files changed, 12 insertions, 16 deletions
diff --git a/src/src/acl.c b/src/src/acl.c index 6c81d349d..00ff83854 100644 --- a/src/src/acl.c +++ b/src/src/acl.c @@ -1074,14 +1074,14 @@ do /* contains embedded newline; needs doubling */ ret = string_cat(ret, &size, &ptr, s, cp-s+1); - ret = string_cat(ret, &size, &ptr, "\n", 1); + ret = string_cat(ret, &size, &ptr, US"\n", 1); s = cp+1; } /* last bit of header */ ret = string_cat(ret, &size, &ptr, s, cp-s+1); /* newline-sep list */ } -while(h = h->next); +while((h = h->next)); ret[ptr-1] = '\0'; /* overwrite last newline */ return ret; diff --git a/src/src/expand.c b/src/src/expand.c index 4dea8b12d..6d5471f98 100644 --- a/src/src/expand.c +++ b/src/src/expand.c @@ -2147,14 +2147,13 @@ switch(cond_type) case ECOND_ACL: /* ${if acl {{name}{arg1}{arg2}...} {yes}{no}} */ { - uschar *nameargs; uschar *user_msg; BOOL cond = FALSE; int size = 0; int ptr = 0; while (isspace(*s)) s++; - if (*s++ != '{') goto COND_FAILED_CURLY_START; + if (*s++ != '{') goto COND_FAILED_CURLY_START; /*}*/ switch(read_subs(sub, sizeof(sub)/sizeof(*sub), 1, &s, yield == NULL, TRUE, US"acl")) @@ -5680,7 +5679,7 @@ while (*s != 0) uschar * list; int sep = 0; uschar * item; - uschar * suffix = ""; + uschar * suffix = US""; BOOL needsep = FALSE; uschar buffer[256]; @@ -5694,10 +5693,10 @@ while (*s != 0) } else switch(*arg) /* specific list-type version */ { - case 'a': t = tree_search(addresslist_anchor, sub); suffix = "_a"; break; - case 'd': t = tree_search(domainlist_anchor, sub); suffix = "_d"; break; - case 'h': t = tree_search(hostlist_anchor, sub); suffix = "_h"; break; - case 'l': t = tree_search(localpartlist_anchor, sub); suffix = "_l"; break; + case 'a': t = tree_search(addresslist_anchor, sub); suffix = US"_a"; break; + case 'd': t = tree_search(domainlist_anchor, sub); suffix = US"_d"; break; + case 'h': t = tree_search(hostlist_anchor, sub); suffix = US"_h"; break; + case 'l': t = tree_search(localpartlist_anchor, sub); suffix = US"_l"; break; default: expand_string_message = string_sprintf("bad suffix on \"list\" operator"); goto EXPAND_FAILED; @@ -5741,13 +5740,13 @@ while (*s != 0) if (*cp++ == ':') /* colon in a non-colon-sep list item, needs doubling */ { yield = string_cat(yield, &size, &ptr, US"::", 2); - item = cp; + item = (uschar *)cp; } else /* sep in item; should already be doubled; emit once */ { yield = string_cat(yield, &size, &ptr, (uschar *)tok, 1); if (*cp == sep) cp++; - item = cp; + item = (uschar *)cp; } } } diff --git a/src/src/receive.c b/src/src/receive.c index 8ac381add..d8b2b79a2 100644 --- a/src/src/receive.c +++ b/src/src/receive.c @@ -936,7 +936,6 @@ add_acl_headers(uschar *acl_name) { header_line *h, *next; header_line *last_received = NULL; -int sep = ':'; if (acl_removed_headers != NULL) { @@ -944,7 +943,6 @@ if (acl_removed_headers != NULL) for (h = header_list; h != NULL; h = h->next) { - int i; uschar *list; BOOL include_header; @@ -3799,6 +3797,7 @@ for this message. */ XXX We do not handle queue-only, freezing, or blackholes. */ +cutthrough_done = 0; if(cutthrough_fd >= 0) { uschar * msg= cutthrough_finaldot(); /* Ask the target system to accept the messsage */ @@ -3820,8 +3819,6 @@ if(cutthrough_fd >= 0) break; } } -else - cutthrough_done = 0; if(smtp_reply == NULL) { diff --git a/src/src/smtp_in.c b/src/src/smtp_in.c index e3746d99d..5bc331fc3 100644 --- a/src/src/smtp_in.c +++ b/src/src/smtp_in.c @@ -4328,7 +4328,7 @@ while (done <= 0) incomplete_transaction_log(US"too many non-mail commands"); log_write(0, LOG_MAIN|LOG_REJECT, "SMTP call from %s dropped: too many " "nonmail commands (last was \"%.*s\")", host_and_ident(FALSE), - s - smtp_cmd_buffer, smtp_cmd_buffer); + (int)(s - smtp_cmd_buffer), smtp_cmd_buffer); smtp_notquit_exit(US"bad-commands", US"554", US"Too many nonmail commands"); done = 1; /* Pretend eof - drops connection */ break; |