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.

diff --git a/mts/smtp/smtp.c b/mts/smtp/smtp.c
index 37a7b07c7c32d629a17fb16c98073e15d264e695..7af8d30980de2e60066ebc4604e1b5d1cc2214d8 100644 (file)
--- a/mts/smtp/smtp.c
+++ b/mts/smtp/smtp.c
@@ -144,7 +144,7 @@ static char *EHLOset (char *);
 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 @@ sendmail_init (char *client, char *server, int watch, int verbose,
        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) {

diff --git a/sbr/client.c b/sbr/client.c
index 732fb47ff59066a0a29056e43c770e6687c2efb2..a03809e1e1787037301beee3391b16b1648620da 100644 (file)
--- a/sbr/client.c
+++ b/sbr/client.c
@@ -85,7 +85,7 @@ client (char *args, char *service, char *response, int len_response, int debug)
                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);

diff --git a/uip/whatnowsbr.c b/uip/whatnowsbr.c
index 42e0d61af54aa0a6e7c8d30263cdb113df88896a..5fcba33c9d20be52d6e210224886c82a7b5bfaf8 100644 (file)
--- a/uip/whatnowsbr.c
+++ b/uip/whatnowsbr.c
@@ -1229,6 +1229,7 @@ sendit (char *sp, char **arg, char *file, int pushed)
                case SERVSW:
                case SASLMECHSW:
                case USERSW:
+               case PORTSW:
                    vec[vecp++] = --cp;
                    if (!(cp = *argp++) || *cp == '-') {
                        advise (NULL, "missing argument to %s", argp[-2]);