NLS data and tz can be cached using caspicum helpers.

Using them we simplifies and unifies sandboxed code.
This commit is contained in:
oshogbo 2018-01-03 07:43:04 +00:00
parent dcba6e6bd0
commit dc341d4bc0

View File

@ -175,34 +175,7 @@ static TAILQ_HEAD(trace_procs, proc_info) trace_procs;
#ifdef WITH_CASPER
static cap_channel_t *cappwd, *capgrp;
#endif
static void
strerror_init(void)
{
/*
* Cache NLS data before entering capability mode.
* XXXPJD: There should be strerror_init() and strsignal_init() in libc.
*/
(void)catopen("libc", NL_CAT_LOCALE);
}
static void
localtime_init(void)
{
time_t ltime;
/*
* Allow localtime(3) to cache /etc/localtime content before entering
* capability mode.
* XXXPJD: There should be localtime_init() in libc.
*/
(void)time(&ltime);
(void)localtime(&ltime);
}
#ifdef WITH_CASPER
static int
cappwdgrp_setup(cap_channel_t **cappwdp, cap_channel_t **capgrpp)
{
@ -450,8 +423,9 @@ main(int argc, char *argv[])
if (!freopen(tracefile, "r", stdin))
err(1, "%s", tracefile);
strerror_init();
localtime_init();
caph_cache_catpages();
caph_cache_tzdata();
#ifdef WITH_CASPER
if (resolv != 0) {
if (cappwdgrp_setup(&cappwd, &capgrp) < 0) {