Merge branch 'master' into nntp

[citadel.git] / citadel / utils / citmail.c

diff --git a/citadel/utils/citmail.c b/citadel/utils/citmail.c
index 36b714f4bc7b6fc459f0481f67c200f28a8564e3..651e561d7391fa269cd71d77cb868fddb3d09418 100644 (file)
--- a/citadel/utils/citmail.c
+++ b/citadel/utils/citmail.c
@@ -3,21 +3,15 @@
  * some other non-Citadel MTA.  It basically just contacts the Citadel LMTP
  * listener on a unix domain socket and transmits the message.
  *
- * Copyright (c) 1987-2009 by the citadel.org team
+ * Copyright (c) 1987-2012 by the citadel.org team
  *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 3 of the License, or
- *  (at your option) any later version.
+ *  This program is open source software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License version 3.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "sysdep.h"
@@ -37,9 +31,6 @@
 #include <limits.h>
 #include <libcitadel.h>
 #include "citadel.h"
-#ifndef HAVE_SNPRINTF
-#include "snprintf.h"
-#endif
 #include "citadel_dirs.h"
 
 int serv_sock;
@@ -228,13 +219,18 @@ int main(int argc, char **argv) {
 
        sp = strchr (buf, ' ');
        if (sp == NULL) {
-               if (debug) fprintf(stderr, "citmail: ould not calculate hostname.\n");
+               if (debug) fprintf(stderr, "citmail: could not calculate hostname.\n");
                cleanup(2);
        }
        sp ++;
        ep = strchr (sp, ' ');
-       if (ep == NULL) cleanup(3);
-       *ep = '\0';
+       if (ep == NULL) {
+               if (debug) fprintf(stderr, "citmail: error parsing hostname\n");
+               cleanup(3);
+       }
+       else
+               *ep = '\0';
+
        strncpy(hostname, sp, sizeof hostname);
 
        snprintf(fromline, sizeof fromline, "From: %s@%s", pw->pw_name, hostname);
@@ -296,12 +292,18 @@ int main(int argc, char **argv) {
                serv_gets(buf);
                strcat(buf, "    ");
        } while (buf[3] == '-');
-       if (buf[0] != '2') cleanup(4);
+       if (buf[0] != '2') {
+               if (debug) fprintf(stderr, "citmail: LHLO command failed\n");
+               cleanup(4);
+       }
 
        snprintf(buf, sizeof buf, "MAIL %s", fromline);
        serv_puts(buf);
        serv_gets(buf);
-       if (buf[0] != '2') cleanup(5);
+       if (buf[0] != '2') {
+               if (debug) fprintf(stderr, "citmail: MAIL command failed\n");
+               cleanup(5);
+       }
 
        for (i=0; i<num_recipients; ++i) {
                snprintf(buf, sizeof buf, "RCPT To: %s", recipients[i]);
@@ -313,7 +315,10 @@ int main(int argc, char **argv) {
 
        serv_puts("DATA");
        serv_gets(buf);
-       if (buf[0]!='3') cleanup(6);
+       if (buf[0]!='3') {
+               if (debug) fprintf(stderr, "citmail: DATA command failed\n");
+               cleanup(6);
+       }
 
        rewind(fp);
        while (fgets(buf, sizeof buf, fp) != NULL) {