X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/a0f0cad535ac370a2c323171b5ebb33736623595..27df20759b4af4267ece906d26d1e9dbbf5e596f:/mts/smtp/smtp.c diff --git a/mts/smtp/smtp.c b/mts/smtp/smtp.c index 68228ee3..fdc56b06 100644 --- a/mts/smtp/smtp.c +++ b/mts/smtp/smtp.c @@ -811,7 +811,7 @@ again: ; &errstr)) != NULL ; ) { if (doingEHLO - && strncmp (buffer, "250", LEN("250")) == 0 + && HasPrefix(buffer, "250") && (buffer[3] == '-' || doingEHLO == 2) && buffer[4]) { if (doingEHLO == 2) { @@ -873,7 +873,7 @@ again: ; continue; if (sm_reply.code < 100) { if (sm_verbose) { - printf ("%s\n", sm_reply.text); + puts(sm_reply.text); fflush (stdout); } goto again; @@ -950,7 +950,7 @@ EHLOset (char *s) for (ehlo = EHLOkeys; *ehlo; ehlo++) { ep = *ehlo; - if (strncmp (ep, s, len) == 0) { + if (HasPrefix(ep, s)) { for (ep += len; *ep == ' '; ep++) continue; return ep; @@ -1028,7 +1028,7 @@ sm_sasl_callback(enum sasl_message_type mtype, unsigned const char *indata, return NOTOK; } - if (strncmp(line, "334 ", 4) != 0) { + if (!HasPrefix(line, "334 ")) { netsec_err(errstr, "Improper SASL protocol response: %s", line); return NOTOK; } @@ -1077,7 +1077,7 @@ sm_sasl_callback(enum sasl_message_type mtype, unsigned const char *indata, if (line == NULL) return NOTOK; - if (strncmp(line, "235 ", 4) != 0) { + if (!HasPrefix(line, "235 ")) { if (len > 4) netsec_err(errstr, "Authentication failed: %s", line + 4); else