projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
finish rework of scoring module.
[apps/madmutt.git]
/
send.c
diff --git
a/send.c
b/send.c
index
f403320
..
e40d3da
100644
(file)
--- a/
send.c
+++ b/
send.c
@@
-1327,16
+1327,15
@@
int ci_send_message (int flags, /* send mode */
* can take effect.
*/
* can take effect.
*/
- if (
option (OPTCRYPTAUTOSIGN)
)
+ if (
mod_crypt.autosign
)
msg->security |= SIGN;
msg->security |= SIGN;
- if (
option (OPTCRYPTAUTOENCRYPT)
)
+ if (
mod_crypt.autoencrypt
)
msg->security |= ENCRYPT;
msg->security |= ENCRYPT;
- if (
option (OPTCRYPTREPLYENCRYPT)
&& cur && (cur->security & ENCRYPT))
+ if (
mod_crypt.replyencrypt
&& cur && (cur->security & ENCRYPT))
msg->security |= ENCRYPT;
msg->security |= ENCRYPT;
- if (
option (OPTCRYPTREPLYSIGN)
&& cur && (cur->security & SIGN))
+ if (
mod_crypt.replysign
&& cur && (cur->security & SIGN))
msg->security |= SIGN;
msg->security |= SIGN;
- if (option (OPTCRYPTREPLYSIGNENCRYPTED) && cur
- && (cur->security & ENCRYPT))
+ if (mod_crypt.replysignencrypted && cur && (cur->security & ENCRYPT))
msg->security |= SIGN;
if (msg->security) {
msg->security |= SIGN;
if (msg->security) {
@@
-1350,10
+1349,9
@@
int ci_send_message (int flags, /* send mode */
* disable individual mechanisms at run-time?
*/
if (cur) {
* disable individual mechanisms at run-time?
*/
if (cur) {
- if (
option (OPTCRYPTAUTOPGP)
&& (cur->security & APPLICATION_PGP))
+ if (
mod_crypt.autopgp
&& (cur->security & APPLICATION_PGP))
msg->security |= APPLICATION_PGP;
msg->security |= APPLICATION_PGP;
- else if (option (OPTCRYPTAUTOSMIME)
- && (cur->security & APPLICATION_SMIME))
+ else if (mod_crypt.autosmime && (cur->security & APPLICATION_SMIME))
msg->security |= APPLICATION_SMIME;
}
msg->security |= APPLICATION_SMIME;
}
@@
-1362,11
+1360,11
@@
int ci_send_message (int flags, /* send mode */
* for the decision.
*/
if (!(msg->security & (APPLICATION_SMIME | APPLICATION_PGP))) {
* for the decision.
*/
if (!(msg->security & (APPLICATION_SMIME | APPLICATION_PGP))) {
- if (
option (OPTCRYPTAUTOSMIME) && option (OPTSMIMEISDEFAULT)
)
+ if (
mod_crypt.autosmime && mod_crypt.smime_is_default
)
msg->security |= APPLICATION_SMIME;
msg->security |= APPLICATION_SMIME;
- else if (
option (OPTCRYPTAUTOPGP)
)
+ else if (
mod_crypt.autopgp
)
msg->security |= APPLICATION_PGP;
msg->security |= APPLICATION_PGP;
- else if (
option (OPTCRYPTAUTOSMIME)
)
+ else if (
mod_crypt.autosmime
)
msg->security |= APPLICATION_SMIME;
}
}
msg->security |= APPLICATION_SMIME;
}
}