diff options
Diffstat (limited to 'pith/conf.c')
| -rw-r--r-- | pith/conf.c | 21 |
1 files changed, 18 insertions, 3 deletions
diff --git a/pith/conf.c b/pith/conf.c index e8c1ceb9..7f450be8 100644 --- a/pith/conf.c +++ b/pith/conf.c @@ -1701,9 +1701,24 @@ init_vars(struct pine *ps, void (*cmds_f) (struct pine *, char **)) GLO_SPELLER = cpystr(DF_VAR_SPELLER); #endif #ifdef SMIME - GLO_PUBLICCERT_DIR = cpystr(DF_PUBLICCERT_DIR); - GLO_PRIVATEKEY_DIR = cpystr(DF_PRIVATEKEY_DIR); - GLO_CACERT_DIR = cpystr(DF_CACERT_DIR); + if(ps->smimedir){ + snprintf(tmp_20k_buf, SIZEOF_20KBUF, "%s/public", ps->smimedir); + tmp_20k_buf[SIZEOF_20KBUF-1] = '\0'; + GLO_PUBLICCERT_DIR = cpystr(tmp_20k_buf); + + snprintf(tmp_20k_buf, SIZEOF_20KBUF, "%s/private", ps->smimedir); + tmp_20k_buf[SIZEOF_20KBUF-1] = '\0'; + GLO_PRIVATEKEY_DIR = cpystr(tmp_20k_buf); + + snprintf(tmp_20k_buf, SIZEOF_20KBUF, "%s/ca", ps->smimedir); + tmp_20k_buf[SIZEOF_20KBUF-1] = '\0'; + GLO_CACERT_DIR = cpystr(tmp_20k_buf); + } + else{ + GLO_PUBLICCERT_DIR = cpystr(DF_PUBLICCERT_DIR); + GLO_PRIVATEKEY_DIR = cpystr(DF_PRIVATEKEY_DIR); + GLO_CACERT_DIR = cpystr(DF_CACERT_DIR); + } #endif /* SMIME */ /* |