Merge branch 'unstable' into RELEASE_5

Former-commit-id: d0654af74f2090060a74aa25b26637a197a6179f
This commit is contained in:
John Sully 2020-01-06 14:24:49 -05:00
commit 47673dd992

View File

@ -5199,7 +5199,10 @@ int main(int argc, char **argv) {
}
if (cserver.fUsePro) {
execv("keydb-pro-server", argv);
const char *keydb_pro_dir = getenv("KEYDB_PRO_DIRECTORY");
sds path = sdsnew(keydb_pro_dir);
path = sdscat(path, "keydb-pro-server");
execv(path, argv);
perror("Failed launch the pro binary");
exit(EXIT_FAILURE);
}