Package: ssmtp
Version: 2.61-13
Followup-For: Bug #346406
Hi,
The attached patch is more complete and silences all of the compile
warnings that I see on amd64 when running "debuild".
-jim
-- System Information:
Debian Release: lenny/sid
APT prefers testing
APT policy: (990, 'testing'), (500, 'unstable'), (1, 'experimental')
Architecture: amd64 (x86_64)
Kernel: Linux 2.6.24-rc8 (SMP w/2 CPU cores; PREEMPT)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/bash
Versions of packages ssmtp depends on:
ii debconf [debconf-2.0] 1.5.18 Debian configuration management sy
ii libc6 2.7-5 GNU C Library: Shared libraries
ii libgnutls13 2.0.4-1 the GNU TLS library - runtime libr
ssmtp recommends no packages.
-- debconf information excluded
diff -purN ssmtp-2.61-orig/base64.c ssmtp-2.61/base64.c
--- ssmtp-2.61-orig/base64.c 2002-05-07 09:26:43.000000000 -0400
+++ ssmtp-2.61/base64.c 2008-01-20 15:42:52.000000000 -0500
@@ -31,7 +31,7 @@ static const char base64val[] = {
};
#define DECODE64(c) (isascii(c) ? base64val[c] : BAD)
-void to64frombits(unsigned char *out, const unsigned char *in, int inlen)
+void to64frombits(char *out, const unsigned char *in, int inlen)
/* raw bytes in quasi-big-endian order to base 64 string (NUL-terminated) */
{
for (; inlen >= 3; inlen -= 3)
@@ -57,7 +57,7 @@ void to64frombits(unsigned char *out, co
*out = '\0';
}
-int from64tobits(char *out, const char *in)
+int from64tobits(unsigned char *out, const char *in)
/* base 64 to raw bytes in quasi-big-endian order, returning count of bytes */
{
int len = 0;
diff -purN ssmtp-2.61-orig/ssmtp.c ssmtp-2.61/ssmtp.c
--- ssmtp-2.61-orig/ssmtp.c 2008-01-20 15:41:11.000000000 -0500
+++ ssmtp-2.61/ssmtp.c 2008-01-20 15:53:34.000000000 -0500
@@ -53,21 +53,21 @@ bool_t use_oldauth = False; /* use old
#define ARPADATE_LENGTH 32 /* Current date in RFC format */
char arpadate[ARPADATE_LENGTH];
-char *auth_user = (char)NULL;
-char *auth_pass = (char)NULL;
-char *auth_method = (char)NULL; /* Mechanism for SMTP authentication */
-char *mail_domain = (char)NULL;
-char *from = (char)NULL; /* Use this as the From: address */
+char *auth_user = NULL;
+char *auth_pass = NULL;
+char *auth_method = NULL; /* Mechanism for SMTP authentication */
+char *mail_domain = NULL;
+char *from = NULL; /* Use this as the From: address */
char *hostname;
char *mailhost = "mailhub";
-char *minus_f = (char)NULL;
-char *minus_F = (char)NULL;
+char *minus_f = NULL;
+char *minus_F = NULL;
char *gecos;
-char *prog = (char)NULL;
+char *prog = NULL;
char *root = NULL;
char *tls_cert = "/etc/ssl/certs/ssmtp.pem"; /* Default Certificate */
-char *uad = (char)NULL;
-char *config_file = (char)NULL; /* alternate configuration file */
+char *uad = NULL;
+char *config_file = NULL; /* alternate configuration file */
headers_t headers, *ht;
@@ -259,7 +259,7 @@ char *strip_post_ws(char *str)
p = (str + strlen(str));
while(isspace(*--p)) {
- *p = (char)NULL;
+ *p = '\0';
}
return(p);
@@ -277,7 +277,7 @@ char *addr_parse(char *str)
#endif
/* Simple case with email address enclosed in <> */
- if((p = strdup(str)) == (char *)NULL) {
+ if((p = strdup(str)) == NULL) {
die("addr_parse(): strdup()");
}
@@ -285,7 +285,7 @@ char *addr_parse(char *str)
q++;
if((p = strchr(q, '>'))) {
- *p = (char)NULL;
+ *p = '\0';
}
#if 0
@@ -308,7 +308,7 @@ char *addr_parse(char *str)
q = strip_post_ws(p);
if(*q == ')') {
while((*--q != '('));
- *q = (char)NULL;
+ *q = '\0';
}
(void)strip_post_ws(p);
@@ -326,7 +326,7 @@ char *append_domain(char *str)
{
char buf[(BUF_SZ + 1)];
- if(strchr(str, '@') == (char *)NULL) {
+ if(strchr(str, '@') == NULL) {
if(snprintf(buf, BUF_SZ, "[EMAIL PROTECTED]", str,
#ifdef REWRITE_DOMAIN
rewrite_domain == True ? mail_domain : hostname
@@ -351,7 +351,7 @@ void standardise(char *str)
char *p;
if((p = strchr(str, '\n'))) {
- *p = (char)NULL;
+ *p = '\0';
}
/* Any line beginning with a dot has an additional dot inserted;
@@ -384,24 +384,24 @@ void revaliases(struct passwd *pw)
while(fgets(buf, sizeof(buf), fp)) {
/* Make comments invisible */
if((p = strchr(buf, '#'))) {
- *p = (char)NULL;
+ *p = '\0';
}
/* Ignore malformed lines and comments */
- if(strchr(buf, ':') == (char *)NULL) {
+ if(strchr(buf, ':') == NULL) {
continue;
}
/* Parse the alias */
if(((p = strtok(buf, ":"))) && !strcmp(p, pw->pw_name)) {
if((p = strtok(NULL, ": \t\r\n"))) {
- if((uad = strdup(p)) == (char *)NULL) {
+ if((uad = strdup(p)) == NULL) {
die("revaliases() -- strdup() failed");
}
}
if((p = strtok(NULL, " \t\r\n:"))) {
- if((mailhost = strdup(p)) == (char *)NULL) {
+ if((mailhost = strdup(p)) == NULL) {
die("revaliases() -- strdup() failed");
}
@@ -438,7 +438,7 @@ char *from_strip(char *str)
}
/* Remove the real name if necessary - just send the address */
- if((p = addr_parse(str)) == (char *)NULL) {
+ if((p = addr_parse(str)) == NULL) {
die("from_strip() -- addr_parse() failed");
}
#if 0
@@ -514,11 +514,11 @@ void rcpt_save(char *str)
#endif
/* Ignore missing usernames */
- if(*str == (char)NULL) {
+ if(*str == '\0') {
return;
}
- if((rt->string = strdup(str)) == (char *)NULL) {
+ if((rt->string = strdup(str)) == NULL) {
die("rcpt_save() -- strdup() failed");
}
@@ -543,7 +543,7 @@ void rcpt_parse(char *str)
(void)fprintf(stderr, "*** rcpt_parse(): str = [%s]\n", str);
#endif
- if((p = strdup(str)) == (char *)NULL) {
+ if((p = strdup(str)) == NULL) {
die("rcpt_parse(): strdup() failed");
}
q = p;
@@ -571,7 +571,7 @@ void rcpt_parse(char *str)
}
/* End of string? */
- if(*(q + 1) == (char)NULL) {
+ if(*(q + 1) == '\0') {
got_addr = True;
}
@@ -579,7 +579,7 @@ void rcpt_parse(char *str)
if((*q == ',') && (in_quotes == False)) {
got_addr = True;
- *q = (char)NULL;
+ *q = '\0';
}
if(got_addr) {
@@ -602,19 +602,21 @@ int crammd5(char *challengeb64, char *us
{
int i;
unsigned char digest[MD5_DIGEST_LEN];
- unsigned char digascii[MD5_DIGEST_LEN * 2];
+ char digascii[MD5_DIGEST_LEN * 2];
unsigned char challenge[(BUF_SZ + 1)];
- unsigned char response[(BUF_SZ + 1)];
- unsigned char secret[(MD5_BLOCK_LEN + 1)];
+ char response[(BUF_SZ + 1)];
+ char secret[(MD5_BLOCK_LEN + 1)];
+ int challenge_len;
memset (secret,0,sizeof(secret));
memset (challenge,0,sizeof(challenge));
strncpy (secret, password, sizeof(secret));
if (!challengeb64 || strlen(challengeb64) > sizeof(challenge) * 3 / 4)
return 0;
- from64tobits(challenge, challengeb64);
+ challenge_len = from64tobits(challenge, challengeb64);
- hmac_md5(challenge, strlen(challenge), secret, strlen(secret), digest);
+ hmac_md5(challenge, challenge_len,
+ (unsigned char *)secret, strlen(secret), digest);
for (i = 0; i < MD5_DIGEST_LEN; i++) {
digascii[2 * i] = hextab[digest[i] >> 4];
@@ -628,7 +630,7 @@ int crammd5(char *challengeb64, char *us
strncpy (response, username, sizeof(response) - sizeof(digascii) - 2);
strcat (response, " ");
strcat (response, digascii);
- to64frombits(responseb64, response, strlen(response));
+ to64frombits(responseb64, (unsigned char *)response, strlen(response));
return 1;
}
@@ -663,7 +665,7 @@ void header_save(char *str)
(void)fprintf(stderr, "header_save(): str = [%s]\n", str);
#endif
- if((p = strdup(str)) == (char *)NULL) {
+ if((p = strdup(str)) == NULL) {
die("header_save() -- strdup() failed");
}
ht->string = p;
@@ -671,7 +673,7 @@ void header_save(char *str)
if(strncasecmp(ht->string, "From:", 5) == 0) {
#if 1
/* Hack check for NULL From: line */
- if(*(p + 6) == (char)NULL) {
+ if(*(p + 6) == '\0') {
return;
}
#endif
@@ -734,19 +736,19 @@ header_parse() -- Break headers into sep
void header_parse(FILE *stream)
{
size_t size = BUF_SZ, len = 0;
- char *p = (char *)NULL, *q;
+ char *p = NULL, *q = NULL;
bool_t in_header = True;
- char l = (char)NULL;
+ char l = '\0';
int c;
while(in_header && ((c = fgetc(stream)) != EOF)) {
/* Must have space for up to two more characters, since we
may need to insert a '\r' */
- if((p == (char *)NULL) || (len >= (size - 1))) {
+ if((p == NULL) || (len >= (size - 1))) {
size += BUF_SZ;
p = (char *)realloc(p, (size * sizeof(char)));
- if(p == (char *)NULL) {
+ if(p == NULL) {
die("header_parse() -- realloc() failed");
}
q = (p + len);
@@ -771,9 +773,9 @@ void header_parse(FILE *stream)
in_header = False;
default:
- *q = (char)NULL;
+ *q = '\0';
if((q = strrchr(p, '\n'))) {
- *q = (char)NULL;
+ *q = '\0';
}
header_save(p);
@@ -804,9 +806,9 @@ void header_parse(FILE *stream)
in_header = False;
default:
- *q = (char)NULL;
+ *q = '\0';
if((q = strrchr(p, '\n'))) {
- *q = (char)NULL;
+ *q = '\0';
}
header_save(p);
@@ -855,9 +857,9 @@ bool_t read_config()
char buf[(BUF_SZ + 1)], *p, *q, *r;
FILE *fp;
- if(config_file == (char *)NULL) {
+ if(config_file == NULL) {
config_file = strdup(CONFIGURATION_FILE);
- if(config_file == (char *)NULL) {
+ if(config_file == NULL) {
die("parse_config() -- strdup() failed");
}
}
@@ -871,11 +873,11 @@ bool_t read_config()
char *rightside;
/* Make comments invisible */
if((p = strchr(buf, '#'))) {
- *p = (char)NULL;
+ *p = '\0';
}
/* Ignore malformed lines and comments */
- if(strchr(buf, '=') == (char *)NULL) continue;
+ if(strchr(buf, '=') == NULL) continue;
/* Parse out keywords */
p=firsttok(&begin, "= \t\n");
@@ -885,7 +887,7 @@ bool_t read_config()
}
if(p && q) {
if(strcasecmp(p, "Root") == 0) {
- if((root = strdup(q)) == (char *)NULL) {
+ if((root = strdup(q)) == NULL) {
die("parse_config() -- strdup() failed");
}
@@ -894,7 +896,7 @@ bool_t read_config()
}
}
else if(strcasecmp(p, "MailHub") == 0) {
- if((mailhost = strdup(q)) == (char *)NULL) {
+ if((mailhost = strdup(q)) == NULL) {
die("parse_config() -- strdup() failed");
}
@@ -944,7 +946,7 @@ bool_t read_config()
mail_domain = strdup(q);
}
- if(mail_domain == (char *)NULL) {
+ if(mail_domain == NULL) {
die("parse_config() -- strdup() failed");
}
rewrite_domain = True;
@@ -1020,7 +1022,7 @@ bool_t read_config()
}
}
else if(strcasecmp(p, "TLSCert") == 0) {
- if((tls_cert = strdup(q)) == (char *)NULL) {
+ if((tls_cert = strdup(q)) == NULL) {
die("parse_config() -- strdup() failed");
}
@@ -1031,7 +1033,7 @@ bool_t read_config()
#endif
/* Command-line overrides these */
else if(strcasecmp(p, "AuthUser") == 0 && !auth_user) {
- if((auth_user = strdup(q)) == (char *)NULL) {
+ if((auth_user = strdup(q)) == NULL) {
die("parse_config() -- strdup() failed");
}
@@ -1040,7 +1042,7 @@ bool_t read_config()
}
}
else if(strcasecmp(p, "AuthPass") == 0 && !auth_pass) {
- if((auth_pass = strdup(q)) == (char *)NULL) {
+ if((auth_pass = strdup(q)) == NULL) {
die("parse_config() -- strdup() failed");
}
@@ -1049,7 +1051,7 @@ bool_t read_config()
}
}
else if(strcasecmp(p, "AuthMethod") == 0 && !auth_method) {
- if((auth_method = strdup(q)) == (char *)NULL) {
+ if((auth_method = strdup(q)) == NULL) {
die("parse_config() -- strdup() failed");
}
@@ -1102,11 +1104,11 @@ int smtp_open(char *host, int port)
#ifdef INET6
struct addrinfo hints, *ai0, *ai;
char servname[NI_MAXSERV];
- int s;
+ int s = -1;
#else
struct sockaddr_in name;
struct hostent *hent;
- int s, namelen;
+ int s = -1, namelen;
#endif
#ifdef HAVE_SSL
@@ -1116,7 +1118,7 @@ int smtp_open(char *host, int port)
/* Init SSL stuff */
SSL_CTX *ctx;
SSL_METHOD *meth;
- X509 *server_cert;
+ const X509 *server_cert;
SSL_load_error_strings();
SSLeay_add_ssl_algorithms();
@@ -1137,6 +1139,7 @@ int smtp_open(char *host, int port)
perror("Use PrivateKey");
return(-1);
}
+ printf("cert ok\n");
#ifdef NOT_USED
if(!SSL_CTX_check_private_key(ctx)) {
@@ -1301,7 +1304,7 @@ char *fd_gets(char *buf, int size, int f
buf[i++] = c;
}
}
- buf[i] = (char)NULL;
+ buf[i] = '\0';
return(buf);
}
@@ -1423,14 +1426,14 @@ int ssmtp(char *argv[])
}
if((p = strtok(pw->pw_gecos, ";,"))) {
- if((gecos = strdup(p)) == (char *)NULL) {
+ if((gecos = strdup(p)) == NULL) {
die("ssmtp() -- strdup() failed");
}
}
revaliases(pw);
/* revaliases() may have defined this */
- if(uad == (char *)NULL) {
+ if(uad == NULL) {
uad = append_domain(pw->pw_name);
}
@@ -1478,7 +1481,7 @@ int ssmtp(char *argv[])
/* Try to log in if username was supplied */
if(auth_user) {
#ifdef MD5AUTH
- if(auth_pass == (char *)NULL) {
+ if(auth_pass == NULL) {
auth_pass = strdup("");
}
@@ -1497,7 +1500,7 @@ int ssmtp(char *argv[])
else {
#endif
memset(buf, 0, sizeof(buf));
- to64frombits(buf, auth_user, strlen(auth_user));
+ to64frombits(buf, (unsigned char *)auth_user, strlen(auth_user));
if (use_oldauth) {
outbytes += smtp_write(sock, "AUTH LOGIN %s", buf);
}
@@ -1509,7 +1512,7 @@ int ssmtp(char *argv[])
}
/* we assume server asked us for Username */
memset(buf, 0, sizeof(buf));
- to64frombits(buf, auth_user, strlen(auth_user));
+ to64frombits(buf, (unsigned char *)auth_user, strlen(auth_user));
outbytes += smtp_write(sock, buf);
}
@@ -1519,7 +1522,7 @@ int ssmtp(char *argv[])
}
memset(buf, 0, sizeof(buf));
- to64frombits(buf, auth_pass, strlen(auth_pass));
+ to64frombits(buf, (unsigned char *)auth_pass, strlen(auth_pass));
#ifdef MD5AUTH
}
#endif
@@ -1714,7 +1717,7 @@ char **parse_options(int argc, char *arg
j = 0;
add = 1;
- while(argv[i][++j] != (char)NULL) {
+ while(argv[i][++j] != '\0') {
switch(argv[i][j]) {
#ifdef INET6
case '6':
@@ -1732,14 +1735,14 @@ char **parse_options(int argc, char *arg
if((!argv[i][(j + 1)])
&& argv[(i + 1)]) {
auth_user = strdup(argv[i+1]);
- if(auth_user == (char *)NULL) {
+ if(auth_user == NULL) {
die("parse_options() -- strdup() failed");
}
add++;
}
else {
auth_user = strdup(argv[i]+j+1);
- if(auth_user == (char *)NULL) {
+ if(auth_user == NULL) {
die("parse_options() -- strdup() failed");
}
}
@@ -1749,14 +1752,14 @@ char **parse_options(int argc, char *arg
if((!argv[i][(j + 1)])
&& argv[(i + 1)]) {
auth_pass = strdup(argv[i+1]);
- if(auth_pass == (char *)NULL) {
+ if(auth_pass == NULL) {
die("parse_options() -- strdup() failed");
}
add++;
}
else {
auth_pass = strdup(argv[i]+j+1);
- if(auth_pass == (char *)NULL) {
+ if(auth_pass == NULL) {
die("parse_options() -- strdup() failed");
}
}
@@ -1807,14 +1810,14 @@ char **parse_options(int argc, char *arg
case 'C':
if((!argv[i][(j + 1)]) && argv[(i + 1)]) {
config_file = strdup(argv[(i + 1)]);
- if(config_file == (char *)NULL) {
+ if(config_file == NULL) {
die("parse_options() -- strdup() failed");
}
add++;
}
else {
config_file = strdup(argv[i]+j+1);
- if(config_file == (char *)NULL) {
+ if(config_file == NULL) {
die("parse_options() -- strdup() failed");
}
}
@@ -1847,14 +1850,14 @@ char **parse_options(int argc, char *arg
case 'F':
if((!argv[i][(j + 1)]) && argv[(i + 1)]) {
minus_F = strdup(argv[(i + 1)]);
- if(minus_F == (char *)NULL) {
+ if(minus_F == NULL) {
die("parse_options() -- strdup() failed");
}
add++;
}
else {
minus_F = strdup(argv[i]+j+1);
- if(minus_F == (char *)NULL) {
+ if(minus_F == NULL) {
die("parse_options() -- strdup() failed");
}
}
@@ -1866,14 +1869,14 @@ char **parse_options(int argc, char *arg
case 'r':
if((!argv[i][(j + 1)]) && argv[(i + 1)]) {
minus_f = strdup(argv[(i + 1)]);
- if(minus_f == (char *)NULL) {
+ if(minus_f == NULL) {
die("parse_options() -- strdup() failed");
}
add++;
}
else {
minus_f = strdup(argv[i]+j+1);
- if(minus_f == (char *)NULL) {
+ if(minus_f == NULL) {
die("parse_options() -- strdup() failed");
}
}
diff -purN ssmtp-2.61-orig/ssmtp.h ssmtp-2.61/ssmtp.h
--- ssmtp-2.61-orig/ssmtp.h 2008-01-20 15:41:11.000000000 -0500
+++ ssmtp-2.61/ssmtp.h 2008-01-20 15:40:44.000000000 -0500
@@ -43,5 +43,5 @@ typedef struct string_list rcpt_t;
void get_arpadate(char *);
/* base64.c */
-void to64frombits(unsigned char *, const unsigned char *, int);
-int from64tobits(char *, const char *);
+void to64frombits(char *, const unsigned char *, int);
+int from64tobits(unsigned char *, const char *);
