1 files changed, 7 insertions, 1 deletions

diff --git a/libetpan/src/driver/implementation/pop3/pop3driver.c b/libetpan/src/driver/implementation/pop3/pop3driver.c
index ea69923..6cc6a9a 100644
--- a/libetpan/src/driver/implementation/pop3/pop3driver.c
+++ b/libetpan/src/driver/implementation/pop3/pop3driver.c
@@ -204,119 +204,125 @@ static int pop3driver_starttls(mailsession * session)
 
   switch (r) {
   case MAILPOP3_NO_ERROR:
     break;
   default:
     return pop3driver_pop3_error_to_mail_error(r);
   }
 
   low = mailstream_get_low(pop3->pop3_stream);
   fd = mailstream_low_get_fd(low);
   if (fd == -1)
     return MAIL_ERROR_STREAM;
   
   new_low = mailstream_low_ssl_open(fd);
   if (new_low == NULL)
     return MAIL_ERROR_STREAM;
   mailstream_low_free(low);
   mailstream_set_low(pop3->pop3_stream, new_low);
   
   return MAIL_NO_ERROR;
 }
 
 static int pop3driver_parameters(mailsession * session,
     int id, void * value)
 {
   struct pop3_session_state_data * data;
 
   data = get_data(session);
 
   switch (id) {
   case POP3DRIVER_SET_AUTH_TYPE:
     {
       int * param;
 
       param = value;
 
       data->pop3_auth_type = * param;
       return MAIL_NO_ERROR;
     }
   }
 
   return MAIL_ERROR_INVAL;
 }
 
 static int pop3driver_login(mailsession * session,
 			    char * userid, char * password)
 {
   int r;
+  //LR
+  int ret;
   carray * msg_tab;
   struct pop3_session_state_data * data;
 
   data = get_data(session);
 
   switch (data->pop3_auth_type) {
   case POP3DRIVER_AUTH_TYPE_TRY_APOP:
     r = mailpop3_login_apop(get_pop3_session(session), userid, password);
     if (r != MAILPOP3_NO_ERROR)
       r = mailpop3_login(get_pop3_session(session), userid, password);
     break;
 
   case POP3DRIVER_AUTH_TYPE_APOP:
     r = mailpop3_login_apop(get_pop3_session(session), userid, password);
     break;
 
   default:
   case POP3DRIVER_AUTH_TYPE_PLAIN:
     r = mailpop3_login(get_pop3_session(session), userid, password);
     break;
   }
 
-  mailpop3_list(get_pop3_session(session), &msg_tab);
+  // LR 2 lines
+  ret = pop3driver_pop3_error_to_mail_error(r);
+  if ( ret ==  MAIL_NO_ERROR  )
+      mailpop3_list(get_pop3_session(session), &msg_tab);
+  // LR
 
   return pop3driver_pop3_error_to_mail_error(r);
 }
 
 static int pop3driver_logout(mailsession * session)
 {
   int r;
 
   r = mailpop3_quit(get_pop3_session(session));
 
   return pop3driver_pop3_error_to_mail_error(r);
 }
 
 static int pop3driver_noop(mailsession * session)
 {
   int r;
 
   r = mailpop3_noop(get_pop3_session(session));
 
   return pop3driver_pop3_error_to_mail_error(r);
 }
 
 static int pop3driver_status_folder(mailsession * session, char * mb,
 				    uint32_t * result_messages,
 				    uint32_t * result_recent,
 				    uint32_t * result_unseen)
 {
   uint32_t count;
   int r;
   
   r = pop3driver_messages_number(session, mb, &count);
   if (r != MAIL_NO_ERROR)
     return r;
           
   * result_messages = count;
   * result_recent = count;
   * result_unseen = count;
   
   return MAIL_NO_ERROR;
 }
 
 static int pop3driver_messages_number(mailsession * session, char * mb,
 				      uint32_t * result)
 {
   carray * msg_tab;
 
   mailpop3_list(get_pop3_session(session), &msg_tab);