Index: app_voicemail.c =================================================================== --- app_voicemail.c (revision 188736) +++ app_voicemail.c (working copy) @@ -2571,6 +2571,7 @@ { struct vm_state *vms_p; + pthread_once(&ts_vmstate.once, ts_vmstate.key_init); if ((vms_p = pthread_getspecific(ts_vmstate.key)) && !strcmp(vms_p->imapuser, vmu->imapuser) && !strcmp(vms_p->username, vmu->mailbox)) { return vms_p; } @@ -2598,6 +2599,7 @@ if (interactive) { struct vm_state *vms; + pthread_once(&ts_vmstate.once, ts_vmstate.key_init); vms = pthread_getspecific(ts_vmstate.key); return vms; } @@ -2633,6 +2635,7 @@ if (interactive) { struct vm_state *vms; + pthread_once(&ts_vmstate.once, ts_vmstate.key_init); vms = pthread_getspecific(ts_vmstate.key); return vms; }