Commit 4e339882 authored by Alon Levy's avatar Alon Levy
Browse files

libcacard/vcard_emul_nss: handle no readers at startup 



When starting with no readers, coolkey should show no slots (with
RHBZ 806038 fixed). Fix initialization to launch the event handling
thread for each module that isn't the internal module regardless of the
number of slots detected for it at initialization time, since slot
number may start as 0 and is dynamic.

RHBZ: 802435
Signed-off-by: default avatarAlon Levy <alevy@redhat.com>
parent 1b902f7d

libcacard/vcard_emul_nss.c

+5 −10
Original line number Diff line number Diff line
@@ -1005,9 +1005,9 @@ vcard_emul_init(const VCardEmulOptions *options) 
    SECMOD_GetReadLock(module_lock);

    for (mlp = module_list; mlp; mlp = mlp->next) {

        SECMODModule *module = mlp->module;

        PRBool has_emul_slots = PR_FALSE;



        if (module == NULL) {

        /* Ignore the internal module */

        if (module == NULL || module == SECMOD_GetInternalModule()) {

            continue;

        }
@@ -1024,9 +1024,6 @@ vcard_emul_init(const VCardEmulOptions *options) 
                                  vreader_emul_delete);

            vreader_add_reader(vreader);



            has_readers = PR_TRUE;

            has_emul_slots = PR_TRUE;



            if (PK11_IsPresent(slot)) {

                VCard *vcard;

                vcard = vcard_emul_mirror_card(vreader);
@@ -1035,12 +1032,10 @@ vcard_emul_init(const VCardEmulOptions *options) 
                vcard_free(vcard);

            }

        }

        if (has_emul_slots) {

        vcard_emul_new_event_thread(module);

    }

    }

    SECMOD_ReleaseReadLock(module_lock);

    nss_emul_init = has_readers;

    nss_emul_init = PR_TRUE;



    return VCARD_EMUL_OK;

}