g_free(mail_size);
- if (session_send_msg(SESSION(session), SESSION_MSG_NORMAL, buf) < 0)
+ if (session_send_msg(SESSION(session), buf) < 0)
return SM_ERROR;
log_print(LOG_PROTOCOL, "%sSMTP> %s\n", (session->is_esmtp?"E":""), buf);
if (!strncmp(msg, "334 ", 4)) {
tmp = g_base64_encode(session->user, strlen(session->user));
- if (session_send_msg(SESSION(session), SESSION_MSG_NORMAL,
- tmp) < 0) {
+ if (session_send_msg(SESSION(session), tmp) < 0) {
g_free(tmp);
return SM_ERROR;
}
log_print(LOG_PROTOCOL, "ESMTP> [USERID]\n");
} else {
/* Server rejects AUTH */
- if (session_send_msg(SESSION(session), SESSION_MSG_NORMAL,
- "*") < 0)
+ if (session_send_msg(SESSION(session), "*") < 0)
return SM_ERROR;
log_print(LOG_PROTOCOL, "ESMTP> *\n");
}
response64 = g_base64_encode(response, strlen(response));
g_free(response);
- if (session_send_msg(SESSION(session), SESSION_MSG_NORMAL,
- response64) < 0) {
+ if (session_send_msg(SESSION(session), response64) < 0) {
g_free(response64);
return SM_ERROR;
}
g_free(response64);
} else {
/* Server rejects AUTH */
- if (session_send_msg(SESSION(session), SESSION_MSG_NORMAL,
- "*") < 0)
+ if (session_send_msg(SESSION(session), "*") < 0)
return SM_ERROR;
log_print(LOG_PROTOCOL, "ESMTP> *\n");
}
case SMTPAUTH_DIGEST_MD5:
default:
/* stop smtp_auth when no correct authtype */
- if (session_send_msg(SESSION(session), SESSION_MSG_NORMAL, "*") < 0)
+ if (session_send_msg(SESSION(session), "*") < 0)
return SM_ERROR;
log_print(LOG_PROTOCOL, "ESMTP> *\n");
break;
tmp = g_strdup("*");
}
- if (session_send_msg(SESSION(session), SESSION_MSG_NORMAL, tmp) < 0) {
+ if (session_send_msg(SESSION(session), tmp) < 0) {
g_free(tmp);
return SM_ERROR;
}
g_snprintf(buf, sizeof(buf), "EHLO %s",
session->hostname ? session->hostname : get_domain_name());
- if (session_send_msg(SESSION(session), SESSION_MSG_NORMAL, buf) < 0)
+ if (session_send_msg(SESSION(session), buf) < 0)
return SM_ERROR;
log_print(LOG_PROTOCOL, "ESMTP> %s\n", buf);
{
session->state = SMTP_STARTTLS;
- if (session_send_msg(SESSION(session), SESSION_MSG_NORMAL, "STARTTLS") < 0)
+ if (session_send_msg(SESSION(session), "STARTTLS") < 0)
return SM_ERROR;
log_print(LOG_PROTOCOL, "ESMTP> STARTTLS\n");
session->state = SMTP_AUTH;
session->auth_type = SMTPAUTH_CRAM_MD5;
- if (session_send_msg(SESSION(session), SESSION_MSG_NORMAL, "AUTH CRAM-MD5") < 0)
+ if (session_send_msg(SESSION(session), "AUTH CRAM-MD5") < 0)
return SM_ERROR;
log_print(LOG_PROTOCOL, "ESMTP> AUTH CRAM-MD5\n");
out = g_strconcat("AUTH PLAIN ", b64buf, NULL);
g_free(b64buf);
- if (session_send_msg(SESSION(session), SESSION_MSG_NORMAL, out) < 0) {
+ if (session_send_msg(SESSION(session), out) < 0) {
g_free(out);
return SM_ERROR;
}
session->state = SMTP_AUTH;
session->auth_type = SMTPAUTH_LOGIN;
- if (session_send_msg(SESSION(session), SESSION_MSG_NORMAL, "AUTH LOGIN") < 0)
+ if (session_send_msg(SESSION(session), "AUTH LOGIN") < 0)
return SM_ERROR;
log_print(LOG_PROTOCOL, "ESMTP> AUTH LOGIN\n");
g_snprintf(buf, sizeof(buf), "HELO %s",
session->hostname ? session->hostname : get_domain_name());
- if (session_send_msg(SESSION(session), SESSION_MSG_NORMAL, buf) < 0)
+ if (session_send_msg(SESSION(session), buf) < 0)
return SM_ERROR;
log_print(LOG_PROTOCOL, "SMTP> %s\n", buf);
g_snprintf(buf, sizeof(buf), "RCPT TO:%s", to);
else
g_snprintf(buf, sizeof(buf), "RCPT TO:<%s>", to);
- if (session_send_msg(SESSION(session), SESSION_MSG_NORMAL, buf) < 0)
+ if (session_send_msg(SESSION(session), buf) < 0)
return SM_ERROR;
log_print(LOG_PROTOCOL, "SMTP> %s\n", buf);
{
session->state = SMTP_DATA;
- if (session_send_msg(SESSION(session), SESSION_MSG_NORMAL, "DATA") < 0)
+ if (session_send_msg(SESSION(session), "DATA") < 0)
return SM_ERROR;
log_print(LOG_PROTOCOL, "SMTP> DATA\n");
{
session->state = SMTP_QUIT;
- session_send_msg(SESSION(session), SESSION_MSG_NORMAL, "QUIT");
+ session_send_msg(SESSION(session), "QUIT");
log_print(LOG_PROTOCOL, "SMTP> QUIT\n");
return SM_OK;
{
session->state = SMTP_EOM;
- if (session_send_msg(SESSION(session), SESSION_MSG_NORMAL, ".") < 0)
+ if (session_send_msg(SESSION(session), ".") < 0)
return SM_ERROR;
log_print(LOG_PROTOCOL, "SMTP> . (EOM)\n");
tmp = g_base64_encode(session->user, strlen(session->user));
g_snprintf(buf, sizeof(buf), "\"%s\"", tmp);
- if (session_send_msg(SESSION(session), SESSION_MSG_NORMAL, buf) < 0) {
+ if (session_send_msg(SESSION(session), buf) < 0) {
g_free(tmp);
return SE_ERROR;
}
log_print(LOG_PROTOCOL, "Sieve> [USERID]\n");
} else {
/* Server rejects AUTH */
- if (session_send_msg(SESSION(session), SESSION_MSG_NORMAL,
- "\"*\"") < 0)
+ if (session_send_msg(SESSION(session), "\"*\"") < 0)
return SE_ERROR;
log_print(LOG_PROTOCOL, "Sieve> *\n");
}
response = g_strdup_printf("\"%s\"", response64);
g_free(response64);
- if (session_send_msg(SESSION(session), SESSION_MSG_NORMAL,
- response) < 0) {
+ if (session_send_msg(SESSION(session), response) < 0) {
g_free(response);
return SE_ERROR;
}
g_free(response);
} else {
/* Server rejects AUTH */
- if (session_send_msg(SESSION(session), SESSION_MSG_NORMAL,
- "\"*\"") < 0)
+ if (session_send_msg(SESSION(session), "\"*\"") < 0)
return SE_ERROR;
log_print(LOG_PROTOCOL, "Sieve> *\n");
}
break;
default:
/* stop sieve_auth when no correct authtype */
- if (session_send_msg(SESSION(session), SESSION_MSG_NORMAL, "*") < 0)
+ if (session_send_msg(SESSION(session), "*") < 0)
return SE_ERROR;
log_print(LOG_PROTOCOL, "Sieve> *\n");
break;
tmp = g_strdup("\"*\"");
}
- if (session_send_msg(SESSION(session), SESSION_MSG_NORMAL, tmp) < 0) {
+ if (session_send_msg(SESSION(session), tmp) < 0) {
g_free(tmp);
return SE_ERROR;
}
session->state = SIEVE_AUTH;
session->auth_type = SIEVEAUTH_CRAM_MD5;
- if (session_send_msg(SESSION(session), SESSION_MSG_NORMAL,
- "Authenticate \"CRAM-MD5\"") < 0)
+ if (session_send_msg(SESSION(session), "Authenticate \"CRAM-MD5\"") < 0)
return SE_ERROR;
log_print(LOG_PROTOCOL, "Sieve> Authenticate CRAM-MD5\n");
out = g_strconcat("Authenticate \"PLAIN\" \"", b64buf, "\"", NULL);
g_free(b64buf);
- if (session_send_msg(SESSION(session), SESSION_MSG_NORMAL, out) < 0) {
+ if (session_send_msg(SESSION(session), out) < 0) {
g_free(out);
return SE_ERROR;
}
session->state = SIEVE_AUTH;
session->auth_type = SIEVEAUTH_LOGIN;
- if (session_send_msg(SESSION(session), SESSION_MSG_NORMAL,
- "Authenticate \"LOGIN\"") < 0)
+ if (session_send_msg(SESSION(session), "Authenticate \"LOGIN\"") < 0)
return SE_ERROR;
log_print(LOG_PROTOCOL, "Sieve> Authenticate LOGIN\n");
log_send(session, cmd);
session->state = cmd->next_state;
session->current_cmd = cmd;
- if (session_send_msg(SESSION(session), SESSION_SEND, cmd->msg) < 0)
+ if (session_send_msg(SESSION(session), cmd->msg) < 0)
return SE_ERROR;
return SE_OK;
sieve_session->config->tls_type != SIEVE_TLS_NO) {
if (sieve_session->capability.starttls) {
log_print(LOG_PROTOCOL, "Sieve> STARTTLS\n");
- session_send_msg(session, SESSION_SEND, "STARTTLS");
+ session_send_msg(session, "STARTTLS");
sieve_session->state = SIEVE_STARTTLS;
} else if (sieve_session->config->tls_type == SIEVE_TLS_YES) {
log_warning(LOG_PROTOCOL, "Sieve: does not support STARTTLS\n");
{
log_print(LOG_PROTOCOL, "Sieve> NOOP\n");
session->state = SIEVE_NOOP;
- if (session_send_msg(SESSION(session), SESSION_SEND, "NOOP") < 0) {
+ if (session_send_msg(SESSION(session), "NOOP") < 0) {
session->state = SIEVE_ERROR;
session->error = SE_ERROR;
return 1;
session->current_cmd = cmd;
session->state = next_state;
log_send(session, cmd);
- if (session_send_msg(SESSION(session), SESSION_SEND, cmd->msg) < 0) {
+ if (session_send_msg(SESSION(session), cmd->msg) < 0) {
/* error */
}
}