Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions CVE-2020-28018/exim-4.92/src/child.c
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ so, what is to be done if it fails.
CEE_RETURN_ARGV is specified, it is updated to give the
number of slots used
minimal TRUE if only minimal argv is required
acount number of additional arguments
account number of additional arguments
... further values to add to argv

Returns: if CEE_RETURN_ARGV is given, returns a pointer to argv;
Expand All @@ -72,7 +72,7 @@ Returns: if CEE_RETURN_ARGV is given, returns a pointer to argv;

uschar **
child_exec_exim(int exec_type, BOOL kill_v, int *pcount, BOOL minimal,
int acount, ...)
int account, ...)
{
int first_special = -1;
int n = 0;
Expand All @@ -83,7 +83,7 @@ uschar **argv;
if (tls_requiretls) extra++;
#endif

argv = store_get((extra + acount + MAX_CLMACROS + 18) * sizeof(char *));
argv = store_get((extra + account + MAX_CLMACROS + 18) * sizeof(char *));

/* In all case, the list starts out with the path, any macros, and a changed
config file. */
Expand Down Expand Up @@ -137,12 +137,12 @@ if (tls_requiretls_copy & REQUIRETLS_MSG)
/* Now add in any others that are in the call. Remember which they were,
for more helpful diagnosis on failure. */

if (acount > 0)
if (account > 0)
{
va_list ap;
va_start(ap, acount);
va_start(ap, account);
first_special = n;
while (acount-- > 0)
while (account-- > 0)
argv[n++] = va_arg(ap, uschar *);
va_end(ap);
}
Expand Down
2 changes: 1 addition & 1 deletion CVE-2020-28018/exim-4.92/src/host.c
Original file line number Diff line number Diff line change
Expand Up @@ -2546,7 +2546,7 @@ Returns: HOST_FIND_FAILED Failed to find the host or domain;
if there was a syntax error,
host_find_failed_syntax is set.
HOST_FIND_AGAIN Could not resolve at this time
HOST_FIND_SECURITY dnsssec required but not acheived
HOST_FIND_SECURITY dnssec required but not acheived
HOST_FOUND Host found
HOST_FOUND_LOCAL The lowest MX record points to this
machine, if MX records were found, or
Expand Down
2 changes: 1 addition & 1 deletion CVE-2020-28018/exim-4.92/src/malware.c
Original file line number Diff line number Diff line change
Expand Up @@ -1574,7 +1574,7 @@ badseek: err = errno;
* on both connections (as one host could resolve to multiple ips) */
for (;;)
{
/*XXX we trust that the cmd_str is ideempotent */
/*XXX we trust that the cmd_str is idempotent */
if ((malware_daemon_ctx.sock = m_tcpsocket(cd->hostspec, cd->tcp_port,
&connhost, &errstr, &cmd_str)) >= 0)
{
Expand Down
2 changes: 1 addition & 1 deletion CVE-2020-9273/proftpd-1.3.7rc2/contrib/mod_tls.c
Original file line number Diff line number Diff line change
Expand Up @@ -6231,7 +6231,7 @@ static int tls_init_ctx(void) {
timeout = 15840;

#else
/* If we are not supporting reneogtiations because the OpenSSL version
/* If we are not supporting renegotiations because the OpenSSL version
* is too old, then set the default cache lifetime to 30 minutes.
*/
timeout = 1800;
Expand Down
2 changes: 1 addition & 1 deletion CVE-2020-9273/proftpd-1.3.7rc2/src/str.c
Original file line number Diff line number Diff line change
Expand Up @@ -237,7 +237,7 @@ char *sstrcat(char *dst, const char *src, size_t n) {
return NULL;
}

/* Edge case short ciruit; strlcat(3) doesn't do what I think it should
/* Edge case short circuit; strlcat(3) doesn't do what I think it should
* do for this particular case.
*/
if (n > 1) {
Expand Down