commit - f1a8eea2670b5d841b6191ddf1e0ce5a79e0bdeb
commit + 510cb0e589614f608ab294b4b8c41c624717aaa1
blob - 1f1e2dee8332e342beff18d5488b24c0cb972f9d
blob + 2464599b5e27158a987b89a3dab27f9dbbfce972
--- src/common/smtp.c
+++ src/common/smtp.c
@@ -188,20 +188,18 @@ static gint smtp_auth(SMTPSession *session)
 
 static gint smtp_auth_recv(SMTPSession *session, const gchar *msg)
 {
-	gchar buf[MESSAGEBUFSIZE], *tmp;
-
 	switch (session->auth_type) {
 	case SMTPAUTH_LOGIN:
 		session->state = SMTP_AUTH_LOGIN_USER;
 
 		if (!strncmp(msg, "334 ", 4)) {
+			char *tmp;
 			tmp = g_base64_encode(session->user, strlen(session->user));
-
 			if (session_send_msg(SESSION(session), tmp) < 0) {
-				g_free(tmp);
+				free(tmp);
 				return SM_ERROR;
 			}
-			g_free(tmp);
+			free(tmp);
 			log_print(LOG_PROTOCOL, "ESMTP> [USERID]\n");
 		} else {
 			/* Server rejects AUTH */
@@ -223,10 +221,9 @@ static gint smtp_auth_recv(SMTPSession *session, const
 
 static gint smtp_auth_login_user_recv(SMTPSession *session, const gchar *msg)
 {
-	gchar *tmp;
-
 	session->state = SMTP_AUTH_LOGIN_PASS;
 
+	gchar *tmp;
 	if (!strncmp(msg, "334 ", 4)) {
 		tmp = g_base64_encode(session->pass, strlen(session->pass));
 	} else {