projects
/
mmh
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed some more problems caught by gcc -ansi -pedantic.
[mmh]
/
mts
/
smtp
/
smtp.c
diff --git
a/mts/smtp/smtp.c
b/mts/smtp/smtp.c
index
8d3a233
..
c18b89b
100644
(file)
--- a/
mts/smtp/smtp.c
+++ b/
mts/smtp/smtp.c
@@
-70,7
+70,9
@@
#define SM_DOT 600 /* see above */
#define SM_QUIT 30
#define SM_CLOS 10
#define SM_DOT 600 /* see above */
#define SM_QUIT 30
#define SM_CLOS 10
+#ifdef CYRUS_SASL
#define SM_AUTH 45
#define SM_AUTH 45
+#endif /* CYRUS_SASL */
static int sm_addrs = 0;
static int sm_alarmed = 0;
static int sm_addrs = 0;
static int sm_alarmed = 0;
@@
-145,9
+147,9
@@
char *EHLOkeys[MAXEHLO + 1];
* static prototypes
*/
static int smtp_init (char *, char *, char *, int, int, int, int, int, int,
* static prototypes
*/
static int smtp_init (char *, char *, char *, int, int, int, int, int, int,
- char *, char *, int);
+ int, char *, char *, int);
static int sendmail_init (char *, char *, int, int, int, int, int, int,
static int sendmail_init (char *, char *, int, int, int, int, int, int,
- char *, char *);
+ int, char *, char *);
static int rclient (char *, char *);
static int sm_ierror (char *fmt, ...);
static int rclient (char *, char *);
static int sm_ierror (char *fmt, ...);
@@
-158,7
+160,7
@@
static int sm_werror (void);
static int smhear (void);
static int sm_rrecord (char *, int *);
static int sm_rerror (int);
static int smhear (void);
static int sm_rrecord (char *, int *);
static int sm_rerror (int);
-static RETSIGTYPE alrmser (int);
+static void alrmser (int);
static char *EHLOset (char *);
static int sm_fwrite(char *, int);
static int sm_fputs(char *);
static char *EHLOset (char *);
static int sm_fwrite(char *, int);
static int sm_fputs(char *);
@@
-171,31
+173,38
@@
static int sm_fgets(char *, int, FILE *);
* Function prototypes needed for SASL
*/
* Function prototypes needed for SASL
*/
-static int sm_auth_sasl(char *, char *, char *);
+static int sm_auth_sasl(char *, int, char *, char *);
#endif /* CYRUS_SASL */
int
sm_init (char *client, char *server, char *port, int watch, int verbose,
#endif /* CYRUS_SASL */
int
sm_init (char *client, char *server, char *port, int watch, int verbose,
- int debug, int onex, int queued, int sasl, char *saslmech,
- char *user, int tls)
+ int debug, int onex, int queued, int sasl, int saslssf,
+ char *saslmech, char *user, int tls)
{
if (sm_mts == MTS_SMTP)
return smtp_init (client, server, port, watch, verbose,
{
if (sm_mts == MTS_SMTP)
return smtp_init (client, server, port, watch, verbose,
- debug, onex, queued, sasl, saslmech, user, tls);
+ debug, onex, queued, sasl, saslssf, saslmech,
+ user, tls);
else
return sendmail_init (client, server, watch, verbose,
else
return sendmail_init (client, server, watch, verbose,
- debug, onex, queued, sasl, saslmech, user);
+ debug, onex, queued, sasl, saslssf, saslmech,
+ user);
}
static int
smtp_init (char *client, char *server, char *port, int watch, int verbose,
int debug, int onex, int queued,
}
static int
smtp_init (char *client, char *server, char *port, int watch, int verbose,
int debug, int onex, int queued,
- int sasl, char *saslmech, char *user, int tls)
+ int sasl, int saslssf, char *saslmech, char *user, int tls)
{
{
+ int result, sd1, sd2;
#ifdef CYRUS_SASL
char *server_mechs;
#ifdef CYRUS_SASL
char *server_mechs;
+#else /* CYRUS_SASL */
+ NMH_UNUSED (sasl);
+ NMH_UNUSED (saslssf);
+ NMH_UNUSED (saslmech);
+ NMH_UNUSED (user);
#endif /* CYRUS_SASL */
#endif /* CYRUS_SASL */
- int result, sd1, sd2;
if (watch)
verbose = TRUE;
if (watch)
verbose = TRUE;
@@
-210,7
+219,7
@@
smtp_init (char *client, char *server, char *port, int watch, int verbose,
if (clientname) {
client = clientname;
} else {
if (clientname) {
client = clientname;
} else {
- client = LocalName(); /* no clientname -> LocalName */
+ client = LocalName(1); /* no clientname -> LocalName */
}
}
}
}
@@
-307,7
+316,7
@@
smtp_init (char *client, char *server, char *port, int watch, int verbose,
*/
if (! sslctx) {
*/
if (! sslctx) {
- SSL_METHOD *method;
+ const SSL_METHOD *method;
SSL_library_init();
SSL_load_error_strings();
SSL_library_init();
SSL_load_error_strings();
@@
-377,7
+386,7
@@
smtp_init (char *client, char *server, char *port, int watch, int verbose,
}
if (sm_debug) {
}
if (sm_debug) {
- SSL_CIPHER *cipher = SSL_get_current_cipher(ssl);
+ const SSL_CIPHER *cipher = SSL_get_current_cipher(ssl);
printf("SSL negotiation successful: %s(%d) %s\n",
SSL_CIPHER_get_name(cipher),
SSL_CIPHER_get_bits(cipher, NULL),
printf("SSL negotiation successful: %s(%d) %s\n",
SSL_CIPHER_get_name(cipher),
SSL_CIPHER_get_bits(cipher, NULL),
@@
-396,6
+405,8
@@
smtp_init (char *client, char *server, char *port, int watch, int verbose,
return RP_RPLY;
}
}
return RP_RPLY;
}
}
+#else /* TLS_SUPPORT */
+ NMH_UNUSED (tls);
#endif /* TLS_SUPPORT */
#ifdef CYRUS_SASL
#endif /* TLS_SUPPORT */
#ifdef CYRUS_SASL
@@
-419,7
+430,7
@@
smtp_init (char *client, char *server, char *port, int watch, int verbose,
saslmech, server_mechs);
}
saslmech, server_mechs);
}
- if (sm_auth_sasl(user, saslmech ? saslmech : server_mechs,
+ if (sm_auth_sasl(user, saslssf, saslmech ? saslmech : server_mechs,
server) != RP_OK) {
sm_end(NOTOK);
return NOTOK;
server) != RP_OK) {
sm_end(NOTOK);
return NOTOK;
@@
-441,14
+452,20
@@
send_options: ;
int
sendmail_init (char *client, char *server, int watch, int verbose,
int debug, int onex, int queued,
int
sendmail_init (char *client, char *server, int watch, int verbose,
int debug, int onex, int queued,
- int sasl, char *saslmech, char *user)
+ int sasl, int saslssf, char *saslmech, char *user)
{
{
+ unsigned int i, result, vecp;
+ int pdi[2], pdo[2];
+ char *vec[15];
#ifdef CYRUS_SASL
char *server_mechs;
#ifdef CYRUS_SASL
char *server_mechs;
+#else /* CYRUS_SASL */
+ NMH_UNUSED (server);
+ NMH_UNUSED (sasl);
+ NMH_UNUSED (saslssf);
+ NMH_UNUSED (saslmech);
+ NMH_UNUSED (user);
#endif /* CYRUS_SASL */
#endif /* CYRUS_SASL */
- int i, result, vecp;
- int pdi[2], pdo[2];
- char *vec[15];
if (watch)
verbose = TRUE;
if (watch)
verbose = TRUE;
@@
-462,7
+479,7
@@
sendmail_init (char *client, char *server, int watch, int verbose,
if (clientname)
client = clientname;
else
if (clientname)
client = clientname;
else
- client = LocalName(); /* no clientname -> LocalName */
+ client = LocalName(1); /* no clientname -> LocalName */
}
/*
}
/*
@@
-590,7
+607,7
@@
sendmail_init (char *client, char *server, int watch, int verbose,
saslmech, server_mechs);
}
saslmech, server_mechs);
}
- if (sm_auth_sasl(user, saslmech ? saslmech : server_mechs,
+ if (sm_auth_sasl(user, saslssf, saslmech ? saslmech : server_mechs,
server) != RP_OK) {
sm_end(NOTOK);
return NOTOK;
server) != RP_OK) {
sm_end(NOTOK);
return NOTOK;
@@
-622,33
+639,9
@@
rclient (char *server, char *service)
}
int
}
int
-sm_winit (int mode, char *from)
+sm_winit (char *from)
{
{
- char *smtpcom = NULL;
-
- switch (mode) {
- case S_MAIL:
- smtpcom = "MAIL";
- break;
-
- case S_SEND:
- smtpcom = "SEND";
- break;
-
- case S_SOML:
- smtpcom = "SOML";
- break;
-
- case S_SAML:
- smtpcom = "SAML";
- break;
-
- default:
- /* Hopefully, we do not get here. */
- break;
- }
-
- switch (smtalk (SM_MAIL, "%s FROM:<%s>", smtpcom, from)) {
+ switch (smtalk (SM_MAIL, "MAIL FROM:<%s>", from)) {
case 250:
sm_addrs = 0;
return RP_OK;
case 250:
sm_addrs = 0;
return RP_OK;
@@
-862,7
+855,7
@@
sm_end (int type)
* (optionally) negotiated a security layer.
*/
static int
* (optionally) negotiated a security layer.
*/
static int
-sm_auth_sasl(char *user, char *mechlist, char *inhost)
+sm_auth_sasl(char *user, int saslssf, char *mechlist, char *inhost)
{
int result, status;
unsigned int buflen, outlen;
{
int result, status;
unsigned int buflen, outlen;
@@
-940,7
+933,8
@@
sm_auth_sasl(char *user, char *mechlist, char *inhost)
memset(&secprops, 0, sizeof(secprops));
secprops.maxbufsize = SASL_MAXRECVBUF;
memset(&secprops, 0, sizeof(secprops));
secprops.maxbufsize = SASL_MAXRECVBUF;
- secprops.max_ssf = tls_active ? 0 : UINT_MAX;
+ secprops.max_ssf =
+ tls_active ? 0 : (saslssf != -1 ? (unsigned int) saslssf : UINT_MAX);
result = sasl_setprop(conn, SASL_SEC_PROPS, &secprops);
result = sasl_setprop(conn, SASL_SEC_PROPS, &secprops);
@@
-1125,6
+1119,8
@@
sm_get_pass(sasl_conn_t *conn, void *context, int id,
char *pass = NULL;
int len;
char *pass = NULL;
int len;
+ NMH_UNUSED (conn);
+
if (! psecret || id != SASL_CB_PASS)
return SASL_BADPARAM;
if (! psecret || id != SASL_CB_PASS)
return SASL_BADPARAM;
@@
-1500,7
+1496,7
@@
sm_rrecord (char *buffer, int *len)
buffer[*len = 0] = 0;
if ((retval = sm_fgets (buffer, BUFSIZ, sm_rfp)) != RP_OK)
buffer[*len = 0] = 0;
if ((retval = sm_fgets (buffer, BUFSIZ, sm_rfp)) != RP_OK)
- return retval;
+ return sm_rerror (retval);
*len = strlen (buffer);
/* *len should be >0 except on EOF, but check for safety's sake */
if (*len == 0)
*len = strlen (buffer);
/* *len should be >0 except on EOF, but check for safety's sake */
if (*len == 0)
@@
-1663,9
+1659,11
@@
sm_rerror (int rc)
}
}
-static RETSIGTYPE
+static void
alrmser (int i)
{
alrmser (int i)
{
+ NMH_UNUSED (i);
+
#ifndef RELIABLE_SIGNALS
SIGNAL (SIGALRM, alrmser);
#endif
#ifndef RELIABLE_SIGNALS
SIGNAL (SIGALRM, alrmser);
#endif