summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorWolfgang Hommel <wolfcw@users.noreply.github.com>2020-04-09 19:53:06 +0200
committerGitHub <noreply@github.com>2020-04-09 19:53:06 +0200
commitc9a3b1baced29aeb4bca483d8ec68e5b446c2dc1 (patch)
tree5479a30b504697415aa7f75c50e5f083b99bcfae /src
parent834953480ecf91ce8055c5f85397436205645ffa (diff)
parent58ccfb6c275810720a1105a650fd0ab09df47571 (diff)
downloadlibfaketime-c9a3b1baced29aeb4bca483d8ec68e5b446c2dc1.tar.gz
Merge pull request #248 from sdettmer/fix_settime_when_using_rcfile
Fixes #247, FAKE_SETTIME has effect even if rcfile is present
Diffstat (limited to 'src')
-rw-r--r--src/libfaketime.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/libfaketime.c b/src/libfaketime.c
index 923e9f5..ec3d404 100644
--- a/src/libfaketime.c
+++ b/src/libfaketime.c
@@ -3405,6 +3405,7 @@ int clock_settime(clockid_t clk_id, const struct timespec *tp) {
offset += (double) nsec_diff/SEC_TO_nSEC;
snprintf(newenv_string, 255, "%+f", offset);
+ parse_config_file = false; /* #247: make sure environment takes precedence */
setenv("FAKETIME", newenv_string, 1);
force_cache_expiration = 1; /* make sure it becomes effective immediately */