[continued from previous message]

+ case env_from_bad_domain:
+ is_editable = 0;
+
+ ef_value = mailer_env_from_value(headers->env_from,
+ &is_editable);
+ ef_domain = mailer_env_from_domain(headers->env_from);
+
+ DPRINT(Debug,10,(&Debug,
+ "env from %s (%s) domain %s bad\n",
+ ef_value ? ef_value : "(?)",
+ is_editable ? "editable" : "can't change",
+ ef_domain ? ef_domain : "(?)"));
+
+ rp_classify_domain_message(headers->env_from,
+ env_from_domain_class,
+ env_from_cdr);
+
+ build_address_classify_message(ef_value,
+ ef_domain,
+ env_from_cdr->is_literal,
+ env_from_cdr->whitelisted_name,
+ env_from_cdr->reserved_name);
+
+ if (is_editable)
+ ret = 1;
+ break;
+ }
+
+
+ DPRINT(Debug,10,(&Debug,"mail_env_from_def_edit=%d\n",
+ ret));
+ return ret;
+ }
+
/*
* verify_transmission() - Ask the user to confirm transmission of the
* message. Returns 1 to send it, -1 to forget it,
***************
*** 2803,2816 ****
dsn, headers, attachments,
file_set,
mailer_info,
! hdr_charset, mailbox,
! encode_hdr,
aview,page,
prompt_area,
parent_message,
remote_server,
PGP_status,
! snd_cmds)
char *filename; /* pathname to mail mssg composition file */
int already_has_text; /* indicates there is already text in the mssg */
struct copy_file *copy_file; /* pointer to buffer holding copy file name */
--- 4483,4498 ----
dsn, headers, attachments,
file_set,
mailer_info,
! mime_info,
! mailbox,
aview,page,
prompt_area,
parent_message,
remote_server,
PGP_status,
! snd_cmds,
! env_from_domain_class_p,
! env_from_cdr)
char *filename; /* pathname to mail mssg composition file */
int already_has_text; /* indicates there is already text in the mssg */
struct copy_file *copy_file; /* pointer to buffer holding copy file name */
***************
*** 2821,2829 ****
struct Attachments *attachments;
charset_t file_set; /* charset of file (filename) */
struct mailer_info *mailer_info;
! charset_t hdr_charset;
struct MailboxView *mailbox; /* needed for system_call() */
- int encode_hdr;
struct AliasView *aview;
struct menu_context *page; /* new menu contex