1 files changed, 4 insertions, 8 deletions

diff --git a/kmicromail/libetpan/smtp/mailsmtp_helper.c b/kmicromail/libetpan/smtp/mailsmtp_helper.c
index 32d6564..7995377 100644
--- a/kmicromail/libetpan/smtp/mailsmtp_helper.c
+++ b/kmicromail/libetpan/smtp/mailsmtp_helper.c
@@ -20,61 +20,57 @@
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 
 /*
  * $Id$
  */
 
 #include "mailsmtp.h"
 #include <string.h>
 #include <stdlib.h>
 #include "mail.h"
 
 int mailsmtp_init(mailsmtp * session)
 {
   int r;
-  session->esmtp = 0;
+
   r = mailesmtp_ehlo(session);
 
-  if (r == MAILSMTP_NO_ERROR) {
-      // session->esmtp = TRUE;
+  if (r == MAILSMTP_NO_ERROR)
     return MAILSMTP_NO_ERROR;
-  }
 
   r = mailsmtp_helo(session);
- /*  if (r == MAILSMTP_NO_ERROR) { */
-/*     session->esmtp = FALSE; */
-/*     return MAILSMTP_NO_ERROR; */
-/*   } */
+  if (r == MAILSMTP_NO_ERROR)
+    return MAILSMTP_NO_ERROR;
 
   return r;
 }
 
 
 
 int mailesmtp_send(mailsmtp * session,
 		    const char * from,
 		    int return_full,
 		    const char * envid,
 		    clist * addresses,
 		    const char * message, size_t size)
 {
   int r;
   clistiter * l;
 
   if (!session->esmtp)
     return mailsmtp_send(session, from, addresses, message, size);
 
   r = mailesmtp_mail(session, from, return_full, envid);
   if (r != MAILSMTP_NO_ERROR)
     return r;
 
   for(l = clist_begin(addresses) ; l != NULL; l = clist_next(l)) {