*/
if ( (config.c_rbl_at_greeting) && (sSMTP->is_msa == 0) ) {
if (rbl_check(message_to_spammer)) {
- if (CtdlThreadCheckStop())
+ if (server_shutting_down)
cprintf("421 %s\r\n", message_to_spammer);
else
cprintf("550 %s\r\n", message_to_spammer);
- CC->kill_me = 1;
+ CC->kill_me = KILLME_SPAMMER;
/* no need to free_recipients(valid), it's not allocated yet */
return;
}
/* Otherwise we're either clean or we check later. */
if (CC->nologin==1) {
- cprintf("500 Too many users are already online (maximum is %d)\r\n",
- config.c_maxsessions
- );
- CC->kill_me = 1;
+ cprintf("451 Too many connections are already open; please try again later.\r\n");
+ CC->kill_me = KILLME_MAX_SESSIONS_EXCEEDED;
/* no need to free_recipients(valid), it's not allocated yet */
return;
}
void smtps_greeting(void) {
CtdlModuleStartCryptoMsgs(NULL, NULL, NULL);
#ifdef HAVE_OPENSSL
- if (!CC->redirect_ssl) CC->kill_me = 1; /* kill session if no crypto */
+ if (!CC->redirect_ssl) CC->kill_me = KILLME_NO_CRYPTO; /* kill session if no crypto */
#endif
smtp_greeting(0);
}
* LMTP is like SMTP but with some extra bonus footage added.
*/
void lmtp_greeting(void) {
- citsmtp *sSMTP;
smtp_greeting(0);
- sSMTP = SMTP;
SMTP->is_lmtp = 1;
}
*/
void smtp_auth_greeting(void) {
cprintf("235 Hello, %s\r\n", CC->user.fullname);
- CtdlLogPrintf(CTDL_NOTICE, "SMTP authenticated %s\n", CC->user.fullname);
+ syslog(LOG_NOTICE, "SMTP authenticated %s\n", CC->user.fullname);
CC->internal_pgm = 0;
CC->cs_flags &= ~CS_STEALTH;
}
citsmtp *sSMTP = SMTP;
CtdlDecodeBase64(username, argbuf, SIZ);
- /* CtdlLogPrintf(CTDL_DEBUG, "Trying <%s>\n", username); */
+ /* syslog(LOG_DEBUG, "Trying <%s>\n", username); */
if (CtdlLoginExistingUser(NULL, username) == login_ok) {
CtdlEncodeBase64(buf, "Password:", 9, 0);
cprintf("334 %s\r\n", buf);
memset(password, 0, sizeof(password));
len = CtdlDecodeBase64(password, argbuf, SIZ);
- /* CtdlLogPrintf(CTDL_DEBUG, "Trying <%s>\n", password); */
+ /* syslog(LOG_DEBUG, "Trying <%s>\n", password); */
if (CtdlTryPassword(password, len) == pass_ok) {
smtp_auth_greeting();
}
&& (!sSMTP->is_lmtp) ) { /* Don't RBL LMTP clients */
if (config.c_rbl_at_greeting == 0) { /* Don't RBL again if we already did it */
if (rbl_check(message_to_spammer)) {
- if (CtdlThreadCheckStop())
+ if (server_shutting_down)
cprintf("421 %s\r\n", message_to_spammer);
else
cprintf("550 %s\r\n", message_to_spammer);
return;
}
- CtdlLogPrintf(CTDL_DEBUG, "Converting message...\n");
+ syslog(LOG_DEBUG, "Converting message...\n");
msg = convert_internet_message_buf(&body);
/* If the user is locally authenticated, FORCE the From: header to
cprintf("%s", result);
}
- /* Write something to the syslog (which may or may not be where the
+ /* Write something to the syslog(which may or may not be where the
* rest of the Citadel logs are going; some sysadmins want LOG_MAIL).
*/
- if (enable_syslog) {
- syslog((LOG_MAIL | LOG_INFO),
- "%ld: from=<%s>, nrcpts=%d, relay=%s [%s], stat=%s",
- msgnum,
- sSMTP->from,
- sSMTP->number_of_recipients,
- CC->cs_host,
- CC->cs_addr,
- result
- );
- }
+ syslog((LOG_MAIL | LOG_INFO),
+ "%ld: from=<%s>, nrcpts=%d, relay=%s [%s], stat=%s",
+ msgnum,
+ sSMTP->from,
+ sSMTP->number_of_recipients,
+ CC->cs_host,
+ CC->cs_addr,
+ result
+ );
/* Clean up */
CtdlFreeMessage(msg);
citsmtp *sSMTP = SMTP;
if (sSMTP == NULL) {
- CtdlLogPrintf(CTDL_EMERG, "Session SMTP data is null. WTF? We will crash now.\n");
+ syslog(LOG_EMERG, "Session SMTP data is null. WTF? We will crash now.\n");
}
time(&CC->lastcmd);
memset(cmdbuf, 0, sizeof cmdbuf); /* Clear it, just in case */
if (client_getln(cmdbuf, sizeof cmdbuf) < 1) {
- CtdlLogPrintf(CTDL_CRIT, "Client disconnected: ending session.\n");
- CC->kill_me = 1;
+ syslog(LOG_CRIT, "SMTP: client disconnected: ending session.\n");
+ CC->kill_me = KILLME_CLIENT_DISCONNECTED;
return;
}
- CtdlLogPrintf(CTDL_INFO, "SMTP server: %s\n", cmdbuf);
+ syslog(LOG_INFO, "SMTP server: %s\n", cmdbuf);
while (strlen(cmdbuf) < 5) strcat(cmdbuf, " ");
if (sSMTP->command_state == smtp_user) {
else if (!strncasecmp(cmdbuf, "QUIT", 4)) {
cprintf("221 Goodbye...\r\n");
- CC->kill_me = 1;
+ CC->kill_me = KILLME_CLIENT_LOGGED_OUT;
return;
}
/* Don't do this stuff if this is not an SMTP session! */
if (CC->h_command_function != smtp_command_loop) return;
- CtdlLogPrintf(CTDL_DEBUG, "Performing SMTP cleanup hook\n");
+ syslog(LOG_DEBUG, "Performing SMTP cleanup hook\n");
free(SMTP);
}
CtdlRegisterSessionHook(smtp_cleanup_function, EVT_STOP);
}
- /* return our Subversion id for the Log */
+ /* return our module name for the log */
return "smtp";
}