projects
/
mmh
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update the developer documentation with the changes to the release
[mmh]
/
mts
/
smtp
/
smtp.c
diff --git
a/mts/smtp/smtp.c
b/mts/smtp/smtp.c
index
caa1c73
..
faca17a
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;
@@
-194,6
+196,10
@@
smtp_init (char *client, char *server, char *port, int watch, int verbose,
{
#ifdef CYRUS_SASL
char *server_mechs;
{
#ifdef CYRUS_SASL
char *server_mechs;
+#else /* CYRUS_SASL */
+ NMH_UNUSED (sasl);
+ NMH_UNUSED (saslmech);
+ NMH_UNUSED (user);
#endif /* CYRUS_SASL */
int result, sd1, sd2;
#endif /* CYRUS_SASL */
int result, sd1, sd2;
@@
-210,7
+216,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 */
}
}
}
}
@@
-396,6
+402,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
@@
-445,6
+453,11
@@
sendmail_init (char *client, char *server, int watch, int verbose,
{
#ifdef CYRUS_SASL
char *server_mechs;
{
#ifdef CYRUS_SASL
char *server_mechs;
+#else /* CYRUS_SASL */
+ NMH_UNUSED (server);
+ NMH_UNUSED (sasl);
+ NMH_UNUSED (saslmech);
+ NMH_UNUSED (user);
#endif /* CYRUS_SASL */
unsigned int i, result, vecp;
int pdi[2], pdo[2];
#endif /* CYRUS_SASL */
unsigned int i, result, vecp;
int pdi[2], pdo[2];
@@
-462,7
+475,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 */
}
/*
}
/*
@@
-1121,6
+1134,8
@@
static int
sm_get_pass(sasl_conn_t *conn, void *context, int id,
sasl_secret_t **psecret)
{
sm_get_pass(sasl_conn_t *conn, void *context, int id,
sasl_secret_t **psecret)
{
+ NMH_UNUSED (conn);
+
char **pw_context = (char **) context;
char *pass = NULL;
int len;
char **pw_context = (char **) context;
char *pass = NULL;
int len;
@@
-1666,6
+1681,8
@@
sm_rerror (int rc)
static void
alrmser (int i)
{
static void
alrmser (int i)
{
+ NMH_UNUSED (i);
+
#ifndef RELIABLE_SIGNALS
SIGNAL (SIGALRM, alrmser);
#endif
#ifndef RELIABLE_SIGNALS
SIGNAL (SIGALRM, alrmser);
#endif