projects
/
mmh
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Filter out all Nmh-* headers in post(1). Do that silently for empty
[mmh]
/
mts
/
smtp
/
smtp.c
diff --git
a/mts/smtp/smtp.c
b/mts/smtp/smtp.c
index
c18b89b
..
404c463
100644
(file)
--- a/
mts/smtp/smtp.c
+++ b/
mts/smtp/smtp.c
@@
-147,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,
- int, char *, char *, 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,
- int, char *, char *);
+ char *, char *);
static int rclient (char *, char *);
static int sm_ierror (char *fmt, ...);
static int rclient (char *, char *);
static int sm_ierror (char *fmt, ...);
@@
-178,22
+178,22
@@
static int sm_auth_sasl(char *, int, char *, char *);
int
sm_init (char *client, char *server, char *port, int watch, int verbose,
int
sm_init (char *client, char *server, char *port, int watch, int verbose,
- int debug, int onex, int queued, int sasl, int saslssf,
+ int debug, 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,
char *saslmech, char *user, int tls)
{
if (sm_mts == MTS_SMTP)
return smtp_init (client, server, port, watch, verbose,
- debug, onex, queued, sasl, saslssf, saslmech,
+ debug, queued, sasl, saslssf, saslmech,
user, tls);
else
return sendmail_init (client, server, watch, verbose,
user, tls);
else
return sendmail_init (client, server, watch, verbose,
- debug, onex, queued, sasl, saslssf, saslmech,
+ debug, queued, sasl, saslssf, saslmech,
user);
}
static int
smtp_init (char *client, char *server, char *port, int watch, int verbose,
user);
}
static int
smtp_init (char *client, char *server, char *port, int watch, int verbose,
- int debug, int onex, int queued,
+ int debug, int queued,
int sasl, int saslssf, char *saslmech, char *user, int tls)
{
int result, sd1, sd2;
int sasl, int saslssf, char *saslmech, char *user, int tls)
{
int result, sd1, sd2;
@@
-441,8
+441,6
@@
smtp_init (char *client, char *server, char *port, int watch, int verbose,
send_options: ;
if (watch && EHLOset ("XVRB"))
smtalk (SM_HELO, "VERB on");
send_options: ;
if (watch && EHLOset ("XVRB"))
smtalk (SM_HELO, "VERB on");
- if (onex && EHLOset ("XONE"))
- smtalk (SM_HELO, "ONEX");
if (queued && EHLOset ("XQUE"))
smtalk (SM_HELO, "QUED");
if (queued && EHLOset ("XQUE"))
smtalk (SM_HELO, "QUED");
@@
-451,7
+449,7
@@
send_options: ;
int
sendmail_init (char *client, char *server, int watch, int verbose,
int
sendmail_init (char *client, char *server, int watch, int verbose,
- int debug, int onex, int queued,
+ int debug, int queued,
int sasl, int saslssf, char *saslmech, char *user)
{
unsigned int i, result, vecp;
int sasl, int saslssf, char *saslmech, char *user)
{
unsigned int i, result, vecp;
@@
-531,10
+529,8
@@
sendmail_init (char *client, char *server, int watch, int verbose,
vec[vecp++] = watch ? "-odi" : queued ? "-odq" : "-odb";
vec[vecp++] = "-oem";
vec[vecp++] = "-om";
vec[vecp++] = watch ? "-odi" : queued ? "-odq" : "-odb";
vec[vecp++] = "-oem";
vec[vecp++] = "-om";
-# ifndef RAND
if (verbose)
vec[vecp++] = "-ov";
if (verbose)
vec[vecp++] = "-ov";
-# endif /* not RAND */
vec[vecp++] = NULL;
setgid (getegid ());
vec[vecp++] = NULL;
setgid (getegid ());
@@
-615,8
+611,6
@@
sendmail_init (char *client, char *server, int watch, int verbose,
}
#endif /* CYRUS_SASL */
}
#endif /* CYRUS_SASL */
- if (onex)
- smtalk (SM_HELO, "ONEX");
if (watch)
smtalk (SM_HELO, "VERB on");
if (watch)
smtalk (SM_HELO, "VERB on");
@@
-768,7
+762,7
@@
sm_end (int type)
int status;
struct smtp sm_note;
int status;
struct smtp sm_note;
- if (sm_mts == MTS_SENDMAIL) {
+ if (sm_mts == MTS_SENDMAIL_SMTP) {
switch (sm_child) {
case NOTOK:
case OK:
switch (sm_child) {
case NOTOK:
case OK: