bashclub/piler
1
0
Fork 0
mirror of https://bitbucket.org/jsuto/piler.git synced 2024-12-25 19:00:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

imap login fix

Browse Source
This commit is contained in:
SJ 2014-12-15 22:20:53 +01:00
parent 2348de0b05
commit 12649bee12
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/config.h
View File

@ -14,7 +14,7 @@
#define VERSION "1.1.1-pre" #define VERSION "1.1.1-pre"
#define BUILD 897 #define BUILD 898
#define HOSTID "mailarchiver" #define HOSTID "mailarchiver"

11
src/imap.c
View File

@ -56,10 +56,11 @@ int get_message_length_from_imap_answer(char *s){
int read_response(int sd, char *buf, int buflen, int *seq, struct __data *data, int use_ssl){ int read_response(int sd, char *buf, int buflen, int *seq, struct __data *data, int use_ssl){
int i=0, n, len=0, rc=0; int i=0, n, len=0, rc=0;
char puf[MAXBUFSIZE], tagok[SMALLBUFSIZE], tagno[SMALLBUFSIZE]; char puf[MAXBUFSIZE], tagok[SMALLBUFSIZE], tagno[SMALLBUFSIZE], tagbad[SMALLBUFSIZE];
snprintf(tagok, sizeof(tagok)-1, "A%d OK", *seq); snprintf(tagok, sizeof(tagok)-1, "A%d OK", *seq);
snprintf(tagno, sizeof(tagno)-1, "A%d NO", *seq); snprintf(tagno, sizeof(tagno)-1, "A%d NO", *seq);
snprintf(tagbad, sizeof(tagbad)-1, "A%d BAD", *seq);
memset(buf, 0, buflen); memset(buf, 0, buflen);
@ -69,7 +70,13 @@ int read_response(int sd, char *buf, int buflen, int *seq, struct __data *data,
if(n + len < buflen) strncat(buf, puf, n); if(n + len < buflen) strncat(buf, puf, n);
else goto END; else goto END;
if(i == 0 && strstr(puf, tagno)) goto END; /*
* possible error message from the imap server:
*
* * BYE Temporary problem, please try again later\r\n
*/
if(i == 0 && (strstr(puf, tagno) || strstr(puf, tagbad) || strstr(puf, "* BYE ")) ) goto END;
len += n; len += n;