• Patch: Elm ME+ 2.5 PLalpha54 -> Elm ME+ 2.5 PLalpha60 [5/13] (2/4)

    From Kari Hurtta@21:1/5 to All on Thu Nov 24 20:26:44 2022
    [continued from previous message]

    int r;
    ***************
    *** 1483,1493 ****
    DPRINT(Debug,12,(&Debug,
    "pop_open_connection: using passhm for open\n"));

    ! r = browser_passhm_open_ra(folder->p->a.pop_mbx.passhm,
    &(folder->p->a.pop_mbx.C),
    - POP_ports,
    STFLAG_is_pop,
    ! PORT_end);

    if (-1 == r) {
    DPRINT(Debug,12,(&Debug,
    --- 2105,2114 ----
    DPRINT(Debug,12,(&Debug,
    "pop_open_connection: using passhm for open\n"));

    ! r = browser_passhm_open_ra2(folder->p->a.pop_mbx.passhm,
    &(folder->p->a.pop_mbx.C),
    STFLAG_is_pop,
    ! &POP_ports_2);

    if (-1 == r) {
    DPRINT(Debug,12,(&Debug,
    ***************
    *** 1513,1527 ****

    } else {

    ! struct service_entry *se = NULL;
    ! int ok = 0;
    ! int got;
    ! struct cancel_data *main_cancel = NULL /* Used if dns lookup was
    ! cancelable */;

    fallback_connect:
    DPRINT(Debug,12,(&Debug,
    ! "pop_open_connection: doing regular open\n"));
    se =
    give_service_entry_can(folder->p->a.pop_mbx.C.host,
    STFLAG_is_pop,itls_ignore,
    --- 2134,2161 ----

    } else {

    ! struct service_entry * se;
    ! struct service_entry * result_se;
    ! int ok;
    ! int got_port;
    ! const struct service_type * got_type;
    !
    ! struc