projects
/
mmh
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Renamed "sendmail" mts method to "sendmail/smtp", allowing "sendmail"
[mmh]
/
sbr
/
mts.c
diff --git
a/sbr/mts.c
b/sbr/mts.c
index
548731e
..
d28f285
100644
(file)
--- a/
sbr/mts.c
+++ b/
sbr/mts.c
@@
-63,7
+63,7
@@
static char localmbox[BUFSIZ];
* MTS specific variables
*/
static char *sm_method = "smtp";
* MTS specific variables
*/
static char *sm_method = "smtp";
-int sm_mts = MTS_SMTP;
+int sm_mts = MTS_SENDMAIL_SMTP;
char *sendmail = SENDMAILPATH;
/*
char *sendmail = SENDMAILPATH;
/*
@@
-148,11
+148,13
@@
mts_init (char *name)
if (strcmp(sm_method, "smtp") == 0)
sm_mts = MTS_SMTP;
if (strcmp(sm_method, "smtp") == 0)
sm_mts = MTS_SMTP;
- else if (strcmp(sm_method, "sendmail") == 0)
- sm_mts = MTS_SENDMAIL;
+ else if (strcmp(sm_method, "sendmail/smtp") == 0)
+ sm_mts = MTS_SENDMAIL_SMTP;
+ else if (strcmp(sm_method, "sendmail/pipe") == 0)
+ sm_mts = MTS_SENDMAIL_PIPE;
else {
advise(NULL, "unsupported \"mts\" value in mts.conf: %s", sm_method);
else {
advise(NULL, "unsupported \"mts\" value in mts.conf: %s", sm_method);
- sm_mts = MTS_SMTP;
+ sm_mts = MTS_SENDMAIL_SMTP;
}
}
}
}
@@
-404,7
+406,9
@@
getuserinfo (void)
/* The $SIGNATURE environment variable overrides the GECOS field's idea of
your real name. If SIGNATURE isn't set, use the Signature profile
/* The $SIGNATURE environment variable overrides the GECOS field's idea of
your real name. If SIGNATURE isn't set, use the Signature profile
- setting if it exists. */
+ setting if it exists.
+ Note that post(8) and whom(1) use context_foil (), so they
+ won't see the profile component. */
if ((cp = getenv ("SIGNATURE")) && *cp)
strncpy (fullname, cp, sizeof(fullname));
else if ((cp = context_find("Signature")))
if ((cp = getenv ("SIGNATURE")) && *cp)
strncpy (fullname, cp, sizeof(fullname));
else if ((cp = context_find("Signature")))