diff options
| -rw-r--r-- | cram.c | 2 | ||||
| -rw-r--r-- | driver.c | 5 | ||||
| -rw-r--r-- | fetchmail.h | 1 |
3 files changed, 6 insertions, 2 deletions
@@ -124,7 +124,9 @@ int do_cram_md5 (int sock, struct query *ctl) /* ship the authentication back, accept the server's responses */ /* PMDF5.2 IMAP has a bug that requires this to be a single write */ + suppress_tags = TRUE; result = gen_transact(sock, buf1, sizeof(buf1)); + suppress_tags = FALSE; if (result) return(result); else @@ -87,6 +87,7 @@ int pass; /* how many times have we re-polled? */ int stage; /* where are we? */ int phase; /* where are we, for error-logging purposes? */ int mytimeout; /* value of nonreponse timeout */ +int suppress_tags; /* emit tags? */ static const struct method *protocol; static jmp_buf restart; @@ -2537,7 +2538,7 @@ va_dcl char buf [MSGBUFSIZE+1]; va_list ap; - if (protocol->tagged) + if (protocol->tagged && !suppress_tags) (void) sprintf(buf, "%s ", GENSYM); else buf[0] = '\0'; @@ -2623,7 +2624,7 @@ va_dcl phase = SERVER_WAIT; - if (protocol->tagged) + if (protocol->tagged && !suppress_tags) (void) sprintf(buf, "%s ", GENSYM); else buf[0] = '\0'; diff --git a/fetchmail.h b/fetchmail.h index 2dbff2f3..5a2ca283 100644 --- a/fetchmail.h +++ b/fetchmail.h @@ -363,6 +363,7 @@ extern int pass; /* number of re-polling pass */ extern flag configdump; /* dump control blocks as Python dictionary */ extern const char *fetchmailhost; /* either "localhost" or an FQDN */ +extern suppress_tags; /* suppress tags in tagged protocols? */ #ifdef SDPS_ENABLE extern char *sdps_envfrom; extern char *sdps_envto; |