don't translate strings in debug_print(), log_print(), log_message(), and log_warning()

[claws.git] / src / common / smtp.c

diff --git a/src/common/smtp.c b/src/common/smtp.c
index 859840338053f436687e47ed17d14cbfb564dc13..92a6f783ee753a062a576244448cf669afd7e59e 100644 (file)
--- a/src/common/smtp.c
+++ b/src/common/smtp.c
@@ -48,7 +48,7 @@ static gint smtp_helo(SMTPSession *session);
 static gint smtp_rcpt(SMTPSession *session);
 static gint smtp_data(SMTPSession *session);
 static gint smtp_send_data(SMTPSession *session);
-static gint smtp_rset(SMTPSession *session);
+/* static gint smtp_rset(SMTPSession *session); */
 static gint smtp_quit(SMTPSession *session);
 static gint smtp_eom(SMTPSession *session);
 
@@ -61,12 +61,10 @@ Session *smtp_session_new(void)
        SMTPSession *session;
 
        session = g_new0(SMTPSession, 1);
+
+       session_init(SESSION(session));
+
        SESSION(session)->type             = SESSION_SMTP;
-       SESSION(session)->server           = NULL;
-       SESSION(session)->port             = 0;
-       SESSION(session)->sock             = NULL;
-       SESSION(session)->state            = SESSION_READY;
-       SESSION(session)->data             = NULL;
 
        SESSION(session)->recv_msg         = smtp_session_recv_msg;
 
@@ -97,6 +95,7 @@ Session *smtp_session_new(void)
        session->auth_type                 = 0;
 
        session->error_val                 = SM_OK;
+       session->error_msg                 = NULL;
 
        return SESSION(session);
 }
@@ -111,6 +110,8 @@ static void smtp_session_destroy(Session *session)
        g_free(smtp_session->from);
 
        g_free(smtp_session->send_data);
+
+       g_free(smtp_session->error_msg);
 }
 
 static gint smtp_from(SMTPSession *session)
@@ -148,7 +149,7 @@ static gint smtp_auth(SMTPSession *session)
                  (session->avail_auth_type & SMTPAUTH_LOGIN) != 0))
                smtp_auth_login(session);
        else {
-               log_warning(_("SMTP AUTH not available\n"));
+               log_warning("SMTP AUTH not available\n");
                return SM_AUTHFAIL;
        }
 
@@ -375,6 +376,7 @@ static gint smtp_send_data(SMTPSession *session)
        return SM_OK;
 }
 
+#if 0
 static gint smtp_rset(SMTPSession *session)
 {
        session->state = SMTP_RSET;
@@ -384,6 +386,7 @@ static gint smtp_rset(SMTPSession *session)
 
        return SM_OK;
 }
+#endif
 
 static gint smtp_quit(SMTPSession *session)
 {
@@ -411,7 +414,7 @@ static gint smtp_session_recv_msg(Session *session, const gchar *msg)
        gboolean cont = FALSE;
 
        if (strlen(msg) < 4) {
-               log_warning(_("bad SMTP response\n"));
+               log_warning("bad SMTP response\n");
                return -1;
        }
 
@@ -431,28 +434,36 @@ static gint smtp_session_recv_msg(Session *session, const gchar *msg)
 
        if (msg[0] == '5' && msg[1] == '0' &&
            (msg[2] == '4' || msg[2] == '3' || msg[2] == '1')) {
-               log_warning(_("error occurred on SMTP session\n"));
+               log_warning("error occurred on SMTP session\n");
                smtp_session->state = SMTP_ERROR;
                smtp_session->error_val = SM_ERROR;
+               g_free(smtp_session->error_msg);
+               smtp_session->error_msg = g_strdup(msg);
                return -1;
        }
 
-       if (msg[0] == '5' && msg[1] == '3' && msg[2] == '5') {
-               smtp_session->state = SMTP_AUTH_FAILED;
+       if (!strncmp(msg, "535", 3)) {
+               log_warning("error occurred on authentication\n");
+               smtp_session->state = SMTP_ERROR;
+               smtp_session->error_val = SM_AUTHFAIL;
+               g_free(smtp_session->error_msg);
+               smtp_session->error_msg = g_strdup(msg);
                return -1;
        }
 
        if (msg[0] != '1' && msg[0] != '2' && msg[0] != '3') {
-               log_warning(_("error occurred on SMTP session\n"));
+               log_warning("error occurred on SMTP session\n");
                smtp_session->state = SMTP_ERROR;
                smtp_session->error_val = SM_ERROR;
+               g_free(smtp_session->error_msg);
+               smtp_session->error_msg = g_strdup(msg);
                return -1;
        }
 
        if (msg[3] == '-')
                cont = TRUE;
        else if (msg[3] != ' ' && msg[3] != '\0') {
-               log_warning(_("bad SMTP response\n"));
+               log_warning("bad SMTP response\n");
                smtp_session->state = SMTP_ERROR;
                smtp_session->error_val = SM_UNRECOVERABLE;
                return -1;
@@ -460,7 +471,7 @@ static gint smtp_session_recv_msg(Session *session, const gchar *msg)
 
        /* ignore all multiline responses except for EHLO */
        if (cont && smtp_session->state != SMTP_EHLO)
-               return 1;
+               return session_recv_msg(session);
 
        switch (smtp_session->state) {
        case SMTP_READY:
@@ -497,7 +508,7 @@ static gint smtp_session_recv_msg(Session *session, const gchar *msg)
        case SMTP_STARTTLS:
 #if USE_OPENSSL
                if (session_start_tls(session) < 0) {
-                       log_warning(_("can't start TLS session\n"));
+                       log_warning("can't start TLS session\n");
                        smtp_session->state = SMTP_ERROR;
                        smtp_session->error_val = SM_ERROR;
                        return -1;
@@ -536,15 +547,14 @@ static gint smtp_session_recv_msg(Session *session, const gchar *msg)
                session_disconnect(session);
                break;
        case SMTP_ERROR:
-       case SMTP_AUTH_FAILED:
        default:
-               log_warning(_("error occurred on SMTP session\n"));
+               log_warning("error occurred on SMTP session\n");
                smtp_session->error_val = SM_ERROR;
                return -1;
        }
 
        if (cont)
-               return 1;
+               return session_recv_msg(session);
 
        return 0;
 }