-/* $Cambridge: exim/src/src/spam.c,v 1.6 2005/05/10 22:39:20 tom Exp $ */
+/* $Cambridge: exim/src/src/spam.c,v 1.10 2005/06/27 15:11:04 tom Exp $ */
/*************************************************
* Exim - an Internet mail transport agent *
struct pollfd pollfd;
#endif
+ /* stop compiler warning */
+ result = result;
+
/* find the username from the option list */
if ((user_name = string_nextinlist(&list, &sep,
user_name_buffer,
if (!num_servers) {
log_write(0, LOG_MAIN|LOG_PANIC,
"spam acl condition: no useable spamd server addresses in spamd_address configuration option.");
- fclose(mbox_file);
+ (void)fclose(mbox_file);
return DEFER;
};
if ( (spamd_sock = ip_socket(SOCK_STREAM, AF_INET)) < 0) {
log_write(0, LOG_MAIN|LOG_PANIC,
"spam acl condition: error creating IP socket for spamd");
- fclose(mbox_file);
+ (void)fclose(mbox_file);
return DEFER;
};
current_server = 0;
if (current_server == start_server) {
log_write(0, LOG_MAIN|LOG_PANIC, "spam acl condition: all spamd servers failed");
- fclose(mbox_file);
- close(spamd_sock);
+ (void)fclose(mbox_file);
+ (void)close(spamd_sock);
return DEFER;
};
};
log_write(0, LOG_MAIN|LOG_PANIC,
"malware acl condition: spamd: unable to acquire socket (%s)",
strerror(errno));
- fclose(mbox_file);
+ (void)fclose(mbox_file);
return DEFER;
}
log_write(0, LOG_MAIN|LOG_PANIC,
"malware acl condition: spamd: unable to connect to UNIX socket %s (%s)",
spamd_address, strerror(errno) );
- fclose(mbox_file);
- close(spamd_sock);
+ (void)fclose(mbox_file);
+ (void)close(spamd_sock);
return DEFER;
}
/* send our request */
if (send(spamd_sock, spamd_buffer, Ustrlen(spamd_buffer), 0) < 0) {
- close(spamd_sock);
+ (void)close(spamd_sock);
log_write(0, LOG_MAIN|LOG_PANIC,
"spam acl condition: spamd send failed: %s", strerror(errno));
- fclose(mbox_file);
- close(spamd_sock);
+ (void)fclose(mbox_file);
+ (void)close(spamd_sock);
return DEFER;
};
pollfd.fd = spamd_sock;
pollfd.events = POLLOUT;
#endif
- fcntl(spamd_sock, F_SETFL, O_NONBLOCK);
+ (void)fcntl(spamd_sock, F_SETFL, O_NONBLOCK);
do {
read = fread(spamd_buffer,1,sizeof(spamd_buffer),mbox_file);
if (read > 0) {
log_write(0, LOG_MAIN|LOG_PANIC,
"spam acl condition: timed out writing spamd socket");
}
- close(spamd_sock);
- fclose(mbox_file);
+ (void)close(spamd_sock);
+ (void)fclose(mbox_file);
return DEFER;
}
#endif
wrote = send(spamd_sock,spamd_buffer + offset,read - offset,0);
+ if (wrote == -1)
+ {
+ log_write(0, LOG_MAIN|LOG_PANIC,
+ "spam acl condition: %s on spamd socket", strerror(errno));
+ (void)close(spamd_sock);
+ (void)fclose(mbox_file);
+ return DEFER;
+ }
if (offset + wrote != read) {
offset += wrote;
goto again;
if (ferror(mbox_file)) {
log_write(0, LOG_MAIN|LOG_PANIC,
"spam acl condition: error reading spool file: %s", strerror(errno));
- close(spamd_sock);
- fclose(mbox_file);
+ (void)close(spamd_sock);
+ (void)fclose(mbox_file);
return DEFER;
}
- fclose(mbox_file);
+ (void)fclose(mbox_file);
/* we're done sending, close socket for writing */
shutdown(spamd_sock,SHUT_WR);
if((i <= 0) && (errno != 0)) {
log_write(0, LOG_MAIN|LOG_PANIC,
"spam acl condition: error reading from spamd socket: %s", strerror(errno));
- close(spamd_sock);
+ (void)close(spamd_sock);
return DEFER;
}
/* reading done */
- close(spamd_sock);
+ (void)close(spamd_sock);
/* dig in the spamd output and put the report in a multiline header, if requested */
if( sscanf(CS spamd_buffer,"SPAMD/%s 0 EX_OK\r\nContent-length: %*u\r\n\r\n%lf/%lf\r\n%n",