git://git.exim.org
/
exim.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
149b0e8
)
Revert "Rspamd: add $authenticated_id as User to scan command"
author
Jeremy Harris
<jgh146exb@wizmail.org>
Sat, 16 Jun 2018 17:22:47 +0000
(18:22 +0100)
committer
Jeremy Harris
<jgh146exb@wizmail.org>
Tue, 26 Jun 2018 11:02:27 +0000
(12:02 +0100)
This reverts commit
6c54be6459b83b955fbd2fd6d6a844f80c98427a
.
src/src/spam.c
patch
|
blob
|
history
diff --git
a/src/src/spam.c
b/src/src/spam.c
index 6451ba2cb91872e2d7c3b3cc75e750b8556091ca..d85e6e104c848560b56a22b30bc2ad6fde5caea1 100644
(file)
--- a/
src/src/spam.c
+++ b/
src/src/spam.c
@@
-371,9
+371,8
@@
start = time(NULL);
if (sd->is_rspamd)
{ /* rspamd variant */
uschar *req_str;
if (sd->is_rspamd)
{ /* rspamd variant */
uschar *req_str;
- const uschar * helo;
- const uschar * fcrdns;
- const uschar * authid;
+ const char *helo;
+ const char *fcrdns;
req_str = string_sprintf("CHECK RSPAMC/1.3\r\nContent-length: %lu\r\n"
"Queue-Id: %s\r\nFrom: <%s>\r\nRecipient-Number: %d\r\n",
req_str = string_sprintf("CHECK RSPAMC/1.3\r\nContent-length: %lu\r\n"
"Queue-Id: %s\r\nFrom: <%s>\r\nRecipient-Number: %d\r\n",
@@
-386,12
+385,10
@@
if (sd->is_rspamd)
req_str = string_sprintf("%sHostname: %s\r\n", req_str, fcrdns);
if (sender_host_address != NULL)
req_str = string_sprintf("%sIP: %s\r\n", req_str, sender_host_address);
req_str = string_sprintf("%sHostname: %s\r\n", req_str, fcrdns);
if (sender_host_address != NULL)
req_str = string_sprintf("%sIP: %s\r\n", req_str, sender_host_address);
- if ((authid = expand_string(US"$authenticated_id")) != NULL && *authid != '\0')
- req_str = string_sprintf("%sUser: %s\r\n", req_str, authid);
req_str = string_sprintf("%s\r\n", req_str);
wrote = send(spamd_cctx.sock, req_str->s, req_str->ptr, 0);
}
req_str = string_sprintf("%s\r\n", req_str);
wrote = send(spamd_cctx.sock, req_str->s, req_str->ptr, 0);
}
-else
+
else
{ /* spamassassin variant */
(void)string_format(spamd_buffer,
sizeof(spamd_buffer),
{ /* spamassassin variant */
(void)string_format(spamd_buffer,
sizeof(spamd_buffer),
@@
-401,7
+398,6
@@
else
/* send our request */
wrote = send(spamd_cctx.sock, spamd_buffer, Ustrlen(spamd_buffer), 0);
}
/* send our request */
wrote = send(spamd_cctx.sock, spamd_buffer, Ustrlen(spamd_buffer), 0);
}
-
if (wrote == -1)
{
(void)close(spamd_cctx.sock);
if (wrote == -1)
{
(void)close(spamd_cctx.sock);