diff options
| author | Eduardo Chappa <chappa@washington.edu> | 2016-03-28 19:13:55 -0600 |
|---|---|---|
| committer | Eduardo Chappa <chappa@washington.edu> | 2016-03-28 19:13:55 -0600 |
| commit | 1b64ebe9b934d70fe6373b52e4adb247fda5f448 (patch) | |
| tree | dff12c85a4179d9b4770fe8e3baa6c6205ae33d4 | |
| parent | 3540ba1bb81b478884944159730cce66f9bdb8fa (diff) | |
| download | alpine-1b64ebe9b934d70fe6373b52e4adb247fda5f448.tar.xz | |
* When a message is saved in the Form Letter folder, add the ability
to save the role being used to compose such message so that settings
such as the SMTP server set in the role can be used when sending such
form message. Suggested and patched by Frank Doepper.
| -rw-r--r-- | alpine/ldapconf.c | 4 | ||||
| -rw-r--r-- | alpine/send.c | 2 | ||||
| -rw-r--r-- | pith/pine.hlp | 5 |
3 files changed, 8 insertions, 3 deletions
diff --git a/alpine/ldapconf.c b/alpine/ldapconf.c index 36993de4..fbf741db 100644 --- a/alpine/ldapconf.c +++ b/alpine/ldapconf.c @@ -1536,7 +1536,7 @@ dir_edit_screen(struct pine *ps, LDAP_SERV_S *def, char *title, char **raw_serve ctmp->help = h_config_ldap_opts_tlsmust; break; case LDAP_F_LDAPS: - ctmp->help = h_config_ldap_opts_ldaps; //TODO: SSL and TLS as radiobutton + ctmp->help = h_config_ldap_opts_ldaps; break; } @@ -2459,7 +2459,7 @@ ldap_feature_list(int index) {"save-search-criteria-not-result", NULL, LDAP_F_REF}, {"disable-ad-hoc-space-substitution", NULL, LDAP_F_NOSUB}, {"attempt-tls-on-connection", NULL, LDAP_F_TLS}, - {"require-tls-on-connection", NULL, LDAP_F_TLSMUST}, // TODO rename tls to starttls + {"require-tls-on-connection", NULL, LDAP_F_TLSMUST}, {"require-ldaps-on-connection", NULL, LDAP_F_LDAPS} }; diff --git a/alpine/send.c b/alpine/send.c index 23b0c79d..dfba59f3 100644 --- a/alpine/send.c +++ b/alpine/send.c @@ -568,7 +568,7 @@ compose_mail(char *given_to, char *fcc_arg, ACTION_S *role_arg, if(F_ON(F_ALT_COMPOSE_MENU, ps_global) || (ret = want_to(FORM_PMT,'y','x',NO_HELP,WT_NORM))=='y'){ if(!redraft(&stream, &outgoing, &body, &fcc, &lcc, &reply, - &redraft_pos, &custom, NULL, REDRAFT_NONE)) + &redraft_pos, &custom, &role, REDRAFT_NONE)) done++; /* stream may or may not be closed in redraft() */ diff --git a/pith/pine.hlp b/pith/pine.hlp index f0b27fab..9eb5575b 100644 --- a/pith/pine.hlp +++ b/pith/pine.hlp @@ -197,6 +197,11 @@ Additions include: <LI> Ignore message from smtp server after a successful authentication challenge. + <LI> When a message is saved in the Form Letter folder, add the ability + to save the role being used to compose such message so that settings + such as the SMTP server set in the role can be used when sending + such form message. Suggested and patched by Frank Doepper. + <LI> If SSLDIR is defined somehow, do not disable S/MIME if the SSLCERTSDIR is not found. |