[Nmh-commits] nmh mts/smtp/smtp.c sbr/client.c uip/whatnowsbr.c

[Ken Hornstein]

CVSROOT:        /sources/nmh
Module name:    nmh
Changes by:     Ken Hornstein <kenh>    09/01/21 19:38:36

Modified files:
        mts/smtp       : smtp.c 
        sbr            : client.c 
        uip            : whatnowsbr.c 

Log message:
        Fix warning in getaddrinfo() call.
        Add missing support for -port in whatnow.
        Make sure the SASL input buffer is allocated when using the sendmail 
mts.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/nmh/mts/smtp/smtp.c?cvsroot=nmh&r1=1.25&r2=1.26
http://cvs.savannah.gnu.org/viewcvs/nmh/sbr/client.c?cvsroot=nmh&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/nmh/uip/whatnowsbr.c?cvsroot=nmh&r1=1.12&r2=1.13

Patches:
Index: mts/smtp/smtp.c
===================================================================
RCS file: /sources/nmh/nmh/mts/smtp/smtp.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- mts/smtp/smtp.c     16 Jan 2009 02:28:55 -0000      1.25
+++ mts/smtp/smtp.c     21 Jan 2009 19:38:36 -0000      1.26
@@ -1,7 +1,7 @@
 /*
  * smtp.c -- nmh SMTP interface
  *
- * $Id: smtp.c,v 1.25 2009/01/16 02:28:55 kenh Exp $
+ * $Id: smtp.c,v 1.26 2009/01/21 19:38:36 kenh Exp $
  *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
@@ -144,7 +144,7 @@
 static int sm_fwrite(char *, int);
 static int sm_fputs(char *);
 static int sm_fputc(int);
-static int sm_getc(void);
+static int sm_fgetc(FILE *);
 static void sm_fflush(void);
 static int sm_fgets(char *, int, FILE *);
 
@@ -326,6 +326,13 @@
        client = "localhost";
 #endif
 
+#ifdef CYRUS_SASL
+    sasl_inbuffer = malloc(SASL_MAXRECVBUF);
+    if (!sasl_inbuffer)
+       return sm_ierror("Unable to allocate %d bytes for read buffer",
+                        SASL_MAXRECVBUF);
+#endif /* CYRUS_SASL */
+
     if (pipe (pdi) == NOTOK)
        return sm_ierror ("no pipes");
     if (pipe (pdo) == NOTOK) {

Index: sbr/client.c
===================================================================
RCS file: /sources/nmh/nmh/sbr/client.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- sbr/client.c        16 Jan 2009 15:48:09 -0000      1.5
+++ sbr/client.c        21 Jan 2009 19:38:36 -0000      1.6
@@ -2,7 +2,7 @@
 /*
  * client.c -- connect to a server
  *
- * $Id: client.c,v 1.5 2009/01/16 15:48:09 kenh Exp $
+ * $Id: client.c,v 1.6 2009/01/21 19:38:36 kenh Exp $
  *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
@@ -85,7 +85,7 @@
                char address[NI_MAXHOST];
 
                rc = getnameinfo(ai->ai_addr, ai->ai_addrlen, address,
-                                sizeof(address), NULL, NULL, NI_NUMERICHOST);
+                                sizeof(address), NULL, 0, NI_NUMERICHOST);
 
                fprintf(stderr, "Connecting to %s...\n",
                        rc ? "unknown" : address);

Index: uip/whatnowsbr.c
===================================================================
RCS file: /sources/nmh/nmh/uip/whatnowsbr.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- uip/whatnowsbr.c    16 Jan 2009 02:28:55 -0000      1.12
+++ uip/whatnowsbr.c    21 Jan 2009 19:38:36 -0000      1.13
@@ -2,7 +2,7 @@
 /*
  * whatnowsbr.c -- the WhatNow shell
  *
- * $Id: whatnowsbr.c,v 1.12 2009/01/16 02:28:55 kenh Exp $
+ * $Id: whatnowsbr.c,v 1.13 2009/01/21 19:38:36 kenh Exp $
  *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
@@ -1229,6 +1229,7 @@
                case SERVSW:
                case SASLMECHSW:
                case USERSW:
+               case PORTSW:
                    vec[vecp++] = --cp;
                    if (!(cp = *argp++) || *cp == '-') {
                        advise (NULL, "missing argument to %s", argp[-2]);