From 92569d7853a2ffde330ecf62f198d61891b72f83 Mon Sep 17 00:00:00 2001 From: Eduardo Chappa Date: Mon, 7 Sep 2015 20:05:16 -0600 Subject: * SMIME: certificates included in messages were not being transferred to a remote container. --- pith/smkeys.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) (limited to 'pith/smkeys.c') diff --git a/pith/smkeys.c b/pith/smkeys.c index 7e992a53..d84aa222 100644 --- a/pith/smkeys.c +++ b/pith/smkeys.c @@ -755,11 +755,17 @@ save_cert_for(char *email, X509 *cert, WhichCerts ctype) err++; if(!err && ret_dir){ - if(strlen(path) + strlen(tempfile) - strlen(ret_dir) + 1 < sizeof(path)) - snprintf(fpath, sizeof(fpath), "%s%c%s", + if(IS_REMOTE(upath)){ + strncpy(fpath, rd->lf, sizeof(fpath)); + fpath[sizeof(fpath)-1] = '\0'; + } + else{ + if(strlen(path) + strlen(tempfile) - strlen(ret_dir) + 1 < sizeof(path)) + snprintf(fpath, sizeof(fpath), "%s%c%s", path, tempfile[strlen(ret_dir)], tempfile + strlen(ret_dir) + 1); - else - err++; + else + err++; + } } else err++; -- cgit v1.2.3-70-g09d2