X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=smtp.c;h=1c99c69675917cbbda7c2e1f6ebf9e91faf8946c;hb=7f6138ffd4935043382ce5f867ee9e177e0a9787;hp=c46128e1402b69c2559366aa1eae1ef91db3dc39;hpb=560361d4982ab966d4c391c0b47025993db3f9f4;p=~andy%2Ffetchmail diff --git a/smtp.c b/smtp.c index c46128e1..1c99c696 100644 --- a/smtp.c +++ b/smtp.c @@ -1,514 +1,381 @@ -/* Copyright 1996 Harry Hochheiser - * All rights reserved. +/* + * smtp.c -- code for speaking SMTP to a listener port + * + * Concept due to Harry Hochheiser. Implementation by ESR. Cleanup and + * strict RFC821 compliance by Cameron MacPherson. + * + * Copyright 1997 Eric S. Raymond, 2009 Matthias Andree * For license terms, see the file COPYING in this directory. */ -/*********************************************************************** - module: smtp.c - project: popforward - programmer: Harry Hochheiser - description: Handling of SMTP connections, and processing of mail - to be forwarded via SMTP connections. +#include "config.h" +#include "fetchmail.h" - 7/30/96. Note: since this file is new from scratch, I'll assume - that I'm working on a modern (ANSI) compiler, and I'll use - prototypes. - - - ***********************************************************************/ - -#include -#include +#include +#include #include #include +#include #include "socket.h" -#include "popforward.h" #include "smtp.h" +#include "i18n.h" -static int POP3_parseHeaders(int number, int socket,char **from,int *replFlag); -static int SMTP_sendMessageHeaders(int mboxfd,struct optrec *option, - char *from); -static int SendData(int f,char *buf,int check); - - -/********************************************************************* - function: SMTP_helo - description: Send a "HELO" message to the SMTP server. - - arguments: - socket TCP/IP socket for connection to SMTP - return value: Result of SMTP_OK: based on codes in popforward.h. - - *********************************************************************/ +struct opt +{ + const char *name; + int value; +}; -int SMTP_helo(int socket,char *host) +static struct opt extensions[] = +{ + {"8BITMIME", ESMTP_8BITMIME}, + {"SIZE", ESMTP_SIZE}, + {"ETRN", ESMTP_ETRN}, + {"AUTH ", ESMTP_AUTH}, +#ifdef ODMR_ENABLE + {"ATRN", ESMTP_ATRN}, +#endif /* ODMR_ENABLE */ + {(char *)NULL, 0}, +}; + +char smtp_response[MSGBUFSIZE]; + +/* XXX: this must not be used for LMTP! */ +int SMTP_helo(int sock, char smtp_mode, const char *host) +/* send a "HELO" message to the SMTP listener */ { int ok; - char buf[SMTPBUFSIZE]; - sprintf(buf,"HELO %s\r\n",host); - SockPrintf(socket,"%s",buf); - ok = SMTP_ok(socket,buf); + + SockPrintf(sock,"HELO %s\r\n", host); + if (outlevel >= O_MONITOR) + report(stdout, "%cMTP> HELO %s\n", smtp_mode, host); + ok = SMTP_ok(sock, smtp_mode, TIMEOUT_HELO); return ok; } - -/********************************************************************* - function: SMTP_from - description: Send a "MAIL FROM:" message to the SMTP server. - - arguments: - socket TCP/IP socket for connection to SMTP - fromuser: user name of originator - fromhost: host name of originator. - - Note: these args are likely to change, as we get fancier about - handling the names. - - return value: Result of SMTP_ok: based on codes in popforward.h. - - *********************************************************************/ -int SMTP_from(int socket,char *fromuser,char *fromhost) +static void SMTP_auth_error(int sock, const char *msg) { - char buf[SMTPBUFSIZE]; /* it's as good as size as any... */ - int ok; - SockPrintf(socket,"MAIL FROM %s@%s\n",fromuser,fromhost); - ok= SMTP_ok(socket,buf); + SockPrintf(sock, "*\r\n"); + SockRead(sock, smtp_response, sizeof(smtp_response) - 1); + if (outlevel >= O_MONITOR) report(stdout, "%s", msg); +} - return ok; +static void SMTP_auth(int sock, char smtp_mode, char *username, char *password, char *buf) +/* ESMTP Authentication support for fetchmail by Wojciech Polak */ +{ + int c; + char *p = 0; + char b64buf[512]; + char tmp[512]; + + if (!username || !password) return; + + memset(b64buf, 0, sizeof(b64buf)); + memset(tmp, 0, sizeof(tmp)); + + if (strstr(buf, "CRAM-MD5")) { + unsigned char digest[16]; + memset(digest, 0, sizeof(digest)); + + if (outlevel >= O_MONITOR) + report(stdout, GT_("ESMTP CRAM-MD5 Authentication...\n")); + SockPrintf(sock, "AUTH CRAM-MD5\r\n"); + SockRead(sock, smtp_response, sizeof(smtp_response) - 1); + strlcpy(tmp, smtp_response, sizeof(tmp)); + + if (strncmp(tmp, "334", 3)) { /* Server rejects AUTH */ + SMTP_auth_error(sock, GT_("Server rejected the AUTH command.\n")); + return; + } + + p = strchr(tmp, ' '); + p++; + /* (hmh) from64tobits will not NULL-terminate strings! */ + if (from64tobits(b64buf, p, sizeof(b64buf) - 1) <= 0) { + SMTP_auth_error(sock, GT_("Bad base64 reply from server.\n")); + return; + } + if (outlevel >= O_DEBUG) + report(stdout, GT_("Challenge decoded: %s\n"), b64buf); + hmac_md5((unsigned char *)password, strlen(password), + (unsigned char *)b64buf, strlen(b64buf), digest, sizeof(digest)); + snprintf(tmp, sizeof(tmp), + "%s %02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x", + username, digest[0], digest[1], digest[2], digest[3], + digest[4], digest[5], digest[6], digest[7], digest[8], + digest[9], digest[10], digest[11], digest[12], digest[13], + digest[14], digest[15]); + + to64frombits(b64buf, tmp, strlen(tmp)); + SockPrintf(sock, "%s\r\n", b64buf); + SMTP_ok(sock, smtp_mode, TIMEOUT_DEFAULT); + } + else if (strstr(buf, "PLAIN")) { + int len; + if (outlevel >= O_MONITOR) + report(stdout, GT_("ESMTP PLAIN Authentication...\n")); + snprintf(tmp, sizeof(tmp), "^%s^%s", username, password); + + len = strlen(tmp); + for (c = len - 1; c >= 0; c--) + { + if (tmp[c] == '^') + tmp[c] = '\0'; + } + to64frombits(b64buf, tmp, len); + SockPrintf(sock, "AUTH PLAIN %s\r\n", b64buf); + SMTP_ok(sock, smtp_mode, TIMEOUT_DEFAULT); + } + else if (strstr(buf, "LOGIN")) { + if (outlevel >= O_MONITOR) + report(stdout, GT_("ESMTP LOGIN Authentication...\n")); + SockPrintf(sock, "AUTH LOGIN\r\n"); + SockRead(sock, smtp_response, sizeof(smtp_response) - 1); + strlcpy(tmp, smtp_response, sizeof(tmp)); + + if (strncmp(tmp, "334", 3)) { /* Server rejects AUTH */ + SMTP_auth_error(sock, GT_("Server rejected the AUTH command.\n")); + return; + } + + p = strchr(tmp, ' '); + p++; + if (from64tobits(b64buf, p, sizeof(b64buf) - 1) <= 0) { + SMTP_auth_error(sock, GT_("Bad base64 reply from server.\n")); + return; + } + to64frombits(b64buf, username, strlen(username)); + SockPrintf(sock, "%s\r\n", b64buf); + SockRead(sock, smtp_response, sizeof(smtp_response) - 1); + strlcpy(tmp, smtp_response, sizeof(tmp)); + p = strchr(tmp, ' '); + if (!p) { + SMTP_auth_error(sock, GT_("Bad base64 reply from server.\n")); + return; + } + p++; + memset(b64buf, 0, sizeof(b64buf)); + if (from64tobits(b64buf, p, sizeof(b64buf) - 1) <= 0) { + SMTP_auth_error(sock, GT_("Bad base64 reply from server.\n")); + return; + } + to64frombits(b64buf, password, strlen(password)); + SockPrintf(sock, "%s\r\n", b64buf); + SMTP_ok(sock, smtp_mode, TIMEOUT_DEFAULT); + } + return; } +int SMTP_ehlo(int sock, char smtp_mode, const char *host, char *name, char *password, int *opt) +/* send a "EHLO" message to the SMTP listener, return extension status bits */ +{ + struct opt *hp; + char auth_response[511]; + SIGHANDLERTYPE alrmsave; + const int tmout = (mytimeout >= TIMEOUT_HELO ? mytimeout : TIMEOUT_HELO); + + SockPrintf(sock,"%cHLO %s\r\n", (smtp_mode == 'S') ? 'E' : smtp_mode, host); + if (outlevel >= O_MONITOR) + report(stdout, "%cMTP> %cHLO %s\n", + smtp_mode, (smtp_mode == 'S') ? 'E' : smtp_mode, host); + + alrmsave = set_signal_handler(SIGALRM, null_signal_handler); + set_timeout(tmout); + + *opt = 0; + while ((SockRead(sock, smtp_response, sizeof(smtp_response)-1)) != -1) + { + size_t n; + + set_timeout(0); + (void)set_signal_handler(SIGALRM, alrmsave); + + n = strlen(smtp_response); + if (n > 0 && smtp_response[n-1] == '\n') + smtp_response[--n] = '\0'; + if (n > 0 && smtp_response[n-1] == '\r') + smtp_response[--n] = '\0'; + if (n < 4) + return SM_ERROR; + smtp_response[n] = '\0'; + if (outlevel >= O_MONITOR) + report(stdout, "%cMTP< %s\n", smtp_mode, smtp_response); + for (hp = extensions; hp->name; hp++) + if (!strncasecmp(hp->name, smtp_response+4, strlen(hp->name))) { + *opt |= hp->value; + if (strncmp(hp->name, "AUTH ", 5) == 0) + strncpy(auth_response, smtp_response, sizeof(auth_response)); + auth_response[sizeof(auth_response)-1] = '\0'; + } + if ((smtp_response[0] == '1' || smtp_response[0] == '2' || smtp_response[0] == '3') && smtp_response[3] == ' ') { + if (*opt & ESMTP_AUTH) + SMTP_auth(sock, smtp_mode, name, password, auth_response); + return SM_OK; + } + else if (smtp_response[3] != '-') + return SM_ERROR; -/********************************************************************* - function: SMTP_rcpt - description: Send a "RCPT TO:" message to the SMTP server. + alrmsave = set_signal_handler(SIGALRM, null_signal_handler); + set_timeout(tmout); + } + return SM_UNRECOVERABLE; +} - arguments: - socket TCP/IP socket for connection to SMTP - toser: user name of recipient - tohost: host name of recipient +int SMTP_from(int sock, char smtp_mode, const char *from, const char *opts) +/* send a "MAIL FROM:" message to the SMTP listener */ +{ + int ok; + char buf[MSGBUFSIZE]; + + if (from[0]=='<') + snprintf(buf, sizeof(buf), "MAIL FROM:%s", from); + else + snprintf(buf, sizeof(buf), "MAIL FROM:<%s>", from); + if (opts) + snprintf(buf+strlen(buf), sizeof(buf)-strlen(buf), "%s", opts); + SockPrintf(sock,"%s\r\n", buf); + if (outlevel >= O_MONITOR) + report(stdout, "%cMTP> %s\n", smtp_mode, buf); + ok = SMTP_ok(sock, smtp_mode, TIMEOUT_MAIL); + return ok; +} - return value: Result of SMTP_OK: based on codes in popforward.h. - - *********************************************************************/ -int SMTP_rcpt(int socket,char *touser,char *tohost) +int SMTP_rcpt(int sock, char smtp_mode, const char *to) +/* send a "RCPT TO:" message to the SMTP listener */ { - char buf[SMTPBUFSIZE]; /* it's as good as size as any... */ int ok; - SockPrintf(socket,"RCPT TO: %s@%s\n",touser,tohost); - ok = SMTP_ok(socket,buf); - + SockPrintf(sock,"RCPT TO:<%s>\r\n", to); + if (outlevel >= O_MONITOR) + report(stdout, "%cMTP> RCPT TO:<%s>\n", smtp_mode, to); + ok = SMTP_ok(sock, smtp_mode, TIMEOUT_RCPT); return ok; } - -/********************************************************************* - function: SMTP_data - description: Send a "DATA" message to the SMTP server. - - arguments: - socket TCP/IP socket for connection to SMTP - - return value: Result of SMTP_OK: based on codes in popforward.h. - - *********************************************************************/ -int SMTP_data(int socket) +int SMTP_data(int sock, char smtp_mode) +/* send a "DATA" message to the SMTP listener */ { - SockPrintf(socket,"DATA\n"); -} - - -/********************************************************************* - function: SMTP_rset - description: Send a "DATA" message to the SMTP server. - - arguments: - socket TCP/IP socket for connection to SMTP + int ok; - return value: Result of SMTP_OK: based on codes in popforward.h. - - *********************************************************************/ -void SMTP_rset(int socket) -{ - SockPrintf(socket,"RSET\n"); + SockPrintf(sock,"DATA\r\n"); + if (outlevel >= O_MONITOR) + report(stdout, "%cMTP> DATA\n", smtp_mode); + ok = SMTP_ok(sock, smtp_mode, TIMEOUT_DATA); + return ok; } - - -/********************************************************************* - function: SMTP_check - description: Returns the status of the smtp connection - 8/13/96, HSH - arguments: - socket TCP/IP socket for connection to SMTP - - return value: based on codes in popforward.h. - Do the dirty work of seeing what the status is.. - *********************************************************************/ -static int SMTP_check(int socket,char *argbuf) +int SMTP_rset(int sock, char smtp_mode) +/* send a "RSET" message to the SMTP listener */ { - int ok; - char buf[SMTPBUFSIZE]; - - if (SMTP_Gets(socket, buf, sizeof(buf)) > 0) { - if (argbuf) - strcpy(argbuf,buf); - if (buf[0] == '1' || buf[0] == '2' || buf[0] == '3') - ok = SM_OK; - else - ok = SM_ERROR; - } - else - ok= SM_UNRECOVERABLE; - return (ok); + int ok; + + SockPrintf(sock,"RSET\r\n"); + if (outlevel >= O_MONITOR) + report(stdout, "%cMTP> RSET\n", smtp_mode); + ok = SMTP_ok(sock, smtp_mode, TIMEOUT_DEFAULT); + return ok; } -/********************************************************************* - function: SMTP_ok - description: Returns the statsus of the smtp connection - 7/31/96, HSH - arguments: - socket TCP/IP socket for connection to SMTP - - return value: based on codes in popforward.h. - - NOTE: As of 7/31/96 Initial implementation, we're just returning - a dummy value of SM_OK. Eventually, we should really implement this. - *********************************************************************/ -int SMTP_ok(int socket,char *argbuf) +int SMTP_quit(int sock, char smtp_mode) +/* send a "QUIT" message to the SMTP listener */ { - int ok; - char buf[SMTPBUFSIZE]; - - /* I can tell that the SMTP server connection is ok if I can read a - status message that starts with "1xx" ,"2xx" or "3xx". - Therefore, it can't be ok if there's no data waiting to be read - - Tried to deal with this with a call to SockDataWaiting, but - it failed badly. - - */ + int ok; - ok = SMTP_check(socket,argbuf); - if (ok == SM_ERROR) /* if we got an error, */ - { - SMTP_rset(socket); - ok = SMTP_check(socket,argbuf); /* how does it look now ? */ - if (ok == SM_OK) - ok = SM_ERROR; /* It's just a simple error, for*/ - /* the current message */ - else - ok = SM_UNRECOVERABLE; /* if It still says error, we're */ - /* in bad shape */ - } + SockPrintf(sock,"QUIT\r\n"); + if (outlevel >= O_MONITOR) + report(stdout, "%cMTP> QUIT\n", smtp_mode); + ok = SMTP_ok(sock, smtp_mode, TIMEOUT_DEFAULT); return ok; } -/********************************************************************* - function: SMTP_Gets - description: Gets a line from the SMTP connection - 7/31/96, HSH - arguments: - socket TCP/IP socket for connection to SMTP - - return value: number of bytes read. - - *********************************************************************/ -int SMTP_Gets(int socket,char *buf,int sz) +int SMTP_eom(int sock, char smtp_mode) +/* send a message data terminator to the SMTP listener */ { - return read(socket,buf,sz); + SockPrintf(sock,".\r\n"); + if (outlevel >= O_MONITOR) + report(stdout, "%cMTP>. (EOM)\n", smtp_mode); + + /* + * When doing LMTP, must process many of these at the outer level. + */ + if (smtp_mode == 'S') + return SMTP_ok(sock, smtp_mode, TIMEOUT_EOM); + else + return SM_OK; } +time_t last_smtp_ok = 0; -/********************************************************************* - function: POP3_readSMTP - description: Read the message content as described in RFC 1225. - arguments: - number message number. - socket ... to which the server is connected. - mboxfd open file descriptor to which the retrieved message will - be written. - options added 7/30/96, HSH send in the whole options package... - server: originating pop server. 7/30/96, HSH - - This procedure is the SMTP version of the original POP3_readmsg that - is found in the original popforward. 8/2/96, HSH - return value: zero if success else PS_* return code. - calls: SockGets. - globals: reads outlevel. - *********************************************************************/ - -int POP3_readSMTP(int number,int socket,int mboxfd,struct optrec *options, - char *server) -{ - char buf [MSGBUFSIZE]; - char smtpbuf[SMTPBUFSIZE]; - char *bufp; - char fromBuf[MSGBUFSIZE]; - char *summaryHeaders[3]; - int sumLines =0; - int needFrom; - int inheaders; - int lines,sizeticker; - int n; - time_t now; - - char *from = NULL; - int replFlag = 0; - - - /* HSH 8/19/96, Archive file */ - - int archive = 0; - - int msgnum = 0; - - - /* This keeps the retrieved message count for display purposes */ - int ok=0; - - /* set up for status message if outlevel allows it */ - /* Get this into log file as well. */ - - - ok = POP3_parseHeaders(number,socket,&from,&replFlag); - if (ok != 0) - { - if (from) free(from); - return(PS_IOERR); - } - - ok = POP3_sendGet(number,options,socket); - if (ok != 0) - { - if (from) free(from); - return(PS_IOERR); - } - - /* 8/19/96 HSH open the archive file.. */ - - if ((archive =archGetFile(options,&msgnum)) <= 0) - { - if (from) free(from); - return(PS_IOERR); - } - - /* reads the message content from the server */ - inheaders = 1; - lines = 0; - sizeticker = MSGBUFSIZE; - while (1) { - if (SockGets(socket,buf,sizeof(buf)) < 0) - { - if (from) free(from); - return(PS_SOCKET); - } - bufp = buf; - if (buf[0] == '\r' || buf[0] == '\n') - inheaders = 0; - if (*bufp == '.') { - bufp++; - if (*bufp == 0) - break; /* end of message */ - } - strcat(bufp,"\n"); - - /* Check for Unix 'From' header, and add a bogus one if it's not - present -- only if not using an MDA. - XXX -- should probably parse real From: header and use its - address field instead of bogus 'POPmail' string. - */ - - - - if (lines == 0) { - if (strlen(bufp) >= strlen("From ")) - needFrom = strncasecmp(bufp,"From ",strlen("From ")); - else - needFrom = 1; - - if ((ok = SMTP_sendMessageHeaders(mboxfd,options,from)) != SM_OK) - goto smtperr; - - if (needFrom) { - now = time(NULL); - sprintf(fromBuf,"From POPmail %s",ctime(&now)); - if ((ok =SendData(mboxfd,fromBuf,0)) != SM_OK) - goto smtperr; - } - } - - n = write(archive,bufp,strlen(bufp)); - - /* write this line to the file */ - if ((ok =SendData(mboxfd,bufp,0)) != SM_OK) - { - /* Abort the message, so we'll be clear.. */ - SendData(mboxfd,BINMAIL_TERM,0); - goto smtperr; - } - - - sizeticker -= strlen(bufp); - lines++; - } - - if ((ok =SendData(mboxfd,BINMAIL_TERM,0)) !=SM_OK) - goto smtperr; - - - /* finish up display output */ - - if (from) free(from); - if (archive != 0) close(archive); - return(0); - -smtperr: - if (archive != 0) close(archive); - SMTP_rset(mboxfd); - if (from) free(from); - return(ok); -} - -/****************************************************************** - function: POP3_parseHeaders - description: Read the headers of the mail message, in order to grab the - "From" and "reply to" fields, to be used for proper - mail processing. - arguments: - number message number - socket TCP socket for POP connection - from character pointer to hold value of message "FROM" field - replFlag indicates whether or not we've seen a reply flag. - - ret. value: non-zero on success, else zero. - globals: SockGets POP3_OK. - calls: reads outlevel. - *****************************************************************/ -int POP3_parseHeaders(number,socket,from,replFlag) -int number; -int socket; -char **from; -int *replFlag; +int SMTP_ok(int sock, char smtp_mode, int mintimeout) +/**< returns status of SMTP connection and saves the message in + * smtp_response, without trailing [CR]LF, but with normalized CRLF + * between multiple lines of multi-line replies */ { + SIGHANDLERTYPE alrmsave; + char reply[MSGBUFSIZE], *i; - int ok; - char buf[MSGBUFSIZE]; - char *bufp; - int len; - - ok = POP3_sendTOP(number,0,socket); - if (ok != 0) - return(ok); - - ok = -1; /* we're not ok until we find "FROM: " */ - /* read lines in until we're done.. */ - while (1) - { - - if (SockGets(socket,buf,sizeof(buf)) < 0) - { - return(PS_SOCKET); - } - bufp = buf; - - if (*bufp == '.') { - bufp++; - if (*bufp == 0) - break; /* end of message */ - } + /* set an alarm for smtp ok */ + alrmsave = set_signal_handler(SIGALRM, null_signal_handler); + set_timeout(mytimeout >= mintimeout ? mytimeout : mintimeout); - len = strlen(buf); - if (len < strlen(HEADER_FROM)) /* since From header is shorter than reply-to, it */ - continue; /* can't be either type. */ + smtp_response[0] = '\0'; - /* if it starts with "FROM: ", grab from */ - if (strncasecmp(buf,HEADER_FROM,strlen(HEADER_FROM)) == 0) + while ((SockRead(sock, reply, sizeof(reply)-1)) != -1) + { + size_t n; + + /* restore alarm */ + set_timeout(0); + set_signal_handler(SIGALRM, alrmsave); + + n = strlen(reply); + if (n > 0 && reply[n-1] == '\n') + reply[--n] = '\0'; + if (n > 0 && reply[n-1] == '\r') + reply[--n] = '\0'; + + /* stomp over control characters */ + for (i = reply; *i; i++) + if (iscntrl((unsigned char)*i)) + *i = '?'; + + if (outlevel >= O_MONITOR) + report(stdout, "%cMTP< %s\n", smtp_mode, reply); + /* note that \0 is part of the strchr search string and the + * blank after the reply code is optional (RFC 5321 4.2.1) */ + if (n < 3 || !strchr(" -", reply[3])) { - bufp = buf + strlen(HEADER_FROM); - *from = strdup(bufp); - ok =0; + if (outlevel >= O_MONITOR) + report(stderr, GT_("smtp listener protocol error\n")); + return SM_UNRECOVERABLE; } - if (strncasecmp(buf,HEADER_REPLY,strlen(HEADER_REPLY)) == 0) - *replFlag = 1; - } - return(ok); -} + last_smtp_ok = time((time_t *) NULL); + strlcat(smtp_response, reply, sizeof(smtp_response)); -/****************************************************************** - function: SMTP_sendMessageHeaders - description: Send the headers for the smtp message along to the mailbox.. - arguments: - number message number - socket TCP socket for POP connection - from character pointer to hold value of message "FROM" field - replFlag indicates whether or not we've seen a reply flag. - - ret. value: non-zero on success, else zero. - globals: SockGets POP3_OK. - calls: reads outlevel. - *****************************************************************/ -int SMTP_sendMessageHeaders(int mboxfd,struct optrec *options,char *from) -{ - char smtpbuf[SMTPBUFSIZE]; - char fromBuf[MSGBUFSIZE]; + if (strchr("123", reply[0]) + && isdigit((unsigned char)reply[1]) + && isdigit((unsigned char)reply[2]) + && strchr(" ", reply[3])) /* matches space and \0 */ { + return SM_OK; + } else if (reply[3] != '-') + return SM_ERROR; - int ok; + strlcat(smtp_response, "\r\n", sizeof(smtp_response)); - /* 7/30/96, HSH add stuff to print out the SMTP commands. */ - ok = SMTP_ok(mboxfd,smtpbuf); - if (ok != SM_OK) - { - return ok; + /* set an alarm for smtp ok */ + set_signal_handler(SIGALRM, null_signal_handler); + set_timeout(mytimeout); } - /* mail is from whoever the headers said it was from */ - sprintf(fromBuf,"MAIL FROM: %s\r\n",from); - if ((ok = SendData(mboxfd,fromBuf,1)) != SM_OK) - return ok; - -/* Now here, add something for the receipt field. 7/30/96, - HSH */ - sprintf(fromBuf,"RCPT TO: %s@%s\r\n",options->forwarduser, - options->forwardhost); - if ((ok=SendData(mboxfd,fromBuf,1)) != SM_OK) - return ok; - sprintf(fromBuf,"DATA\r\n"); - ok =SendData(mboxfd,fromBuf,1); - return ok; - -} + /* restore alarm */ + set_timeout(0); + set_signal_handler(SIGALRM, alrmsave); -/****************************************************************** - function: SendData - description: Write to socket or file, as appropriate for destination - arguments: - f socket or file descriptor - buf buffer to write - dest options destination. - check 1 if we should check for SMTP_ok, 0 if not... - ignored if DEST is not TO_SMTP - 7/30/96 HSH added - - ret. value: 0 if ok, otherwise, non-zero.. - globals: none. - calls: SockWrite - *****************************************************************/ - -static int SendData(int f,char *buf,int check) -{ - int res; - char smtpbuf[SMTPBUFSIZE]; - int len = strlen(buf); - - res = SockWrite(f,buf,len); - if (check != 0) - { - res = SMTP_ok(f,smtpbuf); - } - return res; + if (outlevel >= O_MONITOR) + report(stderr, GT_("smtp listener protocol error\n")); + return SM_UNRECOVERABLE; } - +/* smtp.c ends here */