• Patch: Elm ME+ 2.5 PLalpha48 -> Elm ME+ 2.5 PLalpha49 [9/9] (3/3)

    From Kari Hurtta@21:1/5 to All on Thu Jan 3 16:46:15 2019
    [continued from previous message]

    ! static char rcsid[] = "@(#)$Id: fastmail.c,v 2.31 2018/12/21 11:21:43 hurtta Exp $";

    /******************************************************************************
    ! * The Elm (ME+) Mail System - $Revision: 2.31 $ $State: Exp $
    *
    * Modified by: Kari Hurtta <hurtta+elm@siilo.FMI.FI>
    * (was hurtta+elm@posti.FMI.FI, hurtta+elm@ozone.FMI.FI)
    ***************
    *** 358,371 ****
    struct address * address1 = NULL;

    const char * maildomain = hostfullname;

    ! const char **mailname_list = give_dt_path_as_elems(&mailname,"mailname");
    !
    ! if (mailname_list && mailname_list[0] && mailname_list[0][0])
    ! maildomain = mailname_list[0];
    else {
    DPRINT(Debug,10,(&Debug,
    ! "simple_add_addr: mailname not set, using hostfullname=%s\n",maildomain));
    }

    DPRINT(Debug,10,(&Debug,
    --- 358,372 ----
    struct address * address1 = NULL;

    const char * maildomain = hostfullname;
    +
    + const char * have_mailname = useful_mailname();

    ! if (have_mailname)
    ! maildomain = have_mailname;
    else {
    DPRINT(Debug,10,(&Debug,
    ! "simple_add_addr: mailname not set or not useful, using hostfullname=%s\n",
    ! maildomain));
    }

    DPRINT(Debug,10,(&Debug,
    ***************
    *** 460,465 ****
    --- 461,468 ----
    int is_text = 1; /* -1 structured, 0 binary, 1 text */
    int test_utf8 = 0;

    + const int read_flags = 0;
    +
    #if DEBUG
    init_debugfile("FASTMAIL");
    #endif
    ***************
    *** 476,487 ****
    zero_mailing_headers(&mailing_headers);

    user_init();
    ! init_misclib();
    ! init_mailerlib();

    ! init_defaults(0);

    ! read_rc_file(0);

    mailer_info = get_mailer_info();

    --- 479,491 ----
    zero_mailing_headers(&mailing_headers);

    user_init();
    ! init_misclib(