* src/common/smtp.c
* src/common/smtp.h
Use ESMTP for all servers advertising it
Add SIZE= parameter to MAIL command for
ESMTP servers
+2004-11-26 [colin] 0.9.12cvs173
+
+ * src/common/smtp.c
+ * src/common/smtp.h
+ Use ESMTP for all servers advertising it
+ Add SIZE= parameter to MAIL command for
+ ESMTP servers
+
2004-11-24 [colin] 0.9.12cvs172
* src/plugins/pgpmime/pgpmime.c
2004-11-24 [colin] 0.9.12cvs172
* src/plugins/pgpmime/pgpmime.c
( cvs diff -u -r 1.12 -r 1.13 src/plugins/pgpmime/pgpmime.c; ) > 0.9.12cvs170.patchset
( cvs diff -u -r 1.12 -r 1.13 src/plugins/pgpmime/pgpmime.c; ) > 0.9.12cvs171.patchset
( cvs diff -u -r 1.13 -r 1.14 src/plugins/pgpmime/pgpmime.c; ) > 0.9.12cvs172.patchset
( cvs diff -u -r 1.12 -r 1.13 src/plugins/pgpmime/pgpmime.c; ) > 0.9.12cvs170.patchset
( cvs diff -u -r 1.12 -r 1.13 src/plugins/pgpmime/pgpmime.c; ) > 0.9.12cvs171.patchset
( cvs diff -u -r 1.13 -r 1.14 src/plugins/pgpmime/pgpmime.c; ) > 0.9.12cvs172.patchset
+( cvs diff -u -r 1.18 -r 1.19 src/common/smtp.c; cvs diff -u -r 1.8 -r 1.9 src/common/smtp.h; ) > 0.9.12cvs173.patchset
MICRO_VERSION=12
INTERFACE_AGE=0
BINARY_AGE=0
MICRO_VERSION=12
INTERFACE_AGE=0
BINARY_AGE=0
EXTRA_RELEASE=
if test \( $EXTRA_VERSION -eq 0 \) -o \( "x$EXTRA_RELEASE" != "x" \); then
EXTRA_RELEASE=
if test \( $EXTRA_VERSION -eq 0 \) -o \( "x$EXTRA_RELEASE" != "x" \); then
static gint smtp_from(SMTPSession *session)
{
gchar buf[MSGBUFSIZE];
static gint smtp_from(SMTPSession *session)
{
gchar buf[MSGBUFSIZE];
+ gchar *mail_size = NULL;
g_return_val_if_fail(session->from != NULL, SM_ERROR);
session->state = SMTP_FROM;
g_return_val_if_fail(session->from != NULL, SM_ERROR);
session->state = SMTP_FROM;
+
+ if (session->is_esmtp)
+ mail_size = g_strdup_printf(" SIZE=%d", session->send_data_len);
+ else
+ mail_size = g_strdup("");
+
if (strchr(session->from, '<'))
if (strchr(session->from, '<'))
- g_snprintf(buf, sizeof(buf), "MAIL FROM:%s", session->from);
+ g_snprintf(buf, sizeof(buf), "MAIL FROM:%s%s", session->from,
+ mail_size);
- g_snprintf(buf, sizeof(buf), "MAIL FROM:<%s>", session->from);
+ g_snprintf(buf, sizeof(buf), "MAIL FROM:<%s>%s", session->from,
+ mail_size);
+
+ g_free(mail_size);
session_send_msg(SESSION(session), SESSION_MSG_NORMAL, buf);
session_send_msg(SESSION(session), SESSION_MSG_NORMAL, buf);
- log_print("SMTP> %s\n", buf);
+ log_print("%sSMTP> %s\n", (session->is_esmtp?"E":""), buf);
switch (smtp_session->state) {
case SMTP_READY:
switch (smtp_session->state) {
case SMTP_READY:
+ if (strstr(msg, "ESMTP"))
+ smtp_session->is_esmtp = TRUE;
case SMTP_CONNECTED:
#if USE_OPENSSL
case SMTP_CONNECTED:
#if USE_OPENSSL
- if (smtp_session->user || session->ssl_type != SSL_NONE)
+ if (smtp_session->user || session->ssl_type != SSL_NONE ||
+ smtp_session->is_esmtp)
- if (smtp_session->user)
+ if (smtp_session->user || smtp_session->is_esmtp)
#endif
smtp_ehlo(smtp_session);
else
#endif
smtp_ehlo(smtp_session);
else
SMTPErrorValue error_val;
gchar *error_msg;
SMTPErrorValue error_val;
gchar *error_msg;
};
Session *smtp_session_new (void);
};
Session *smtp_session_new (void);