1
0
mirror of https://github.com/systemd/systemd synced 2025-09-30 17:24:46 +02:00

Compare commits

..

4 Commits

Author SHA1 Message Date
Lennart Poettering
8dfc2beb57 github: expressly ask for logs in github issue template
Apparently it's not obvious that logs are a good thing to provide, hence
let's explicitly ask for them.
2021-02-10 14:43:16 +01:00
Lennart Poettering
505061bb4f clock-util: modernize settimeofday() timezone calls
Let's use structured initialization, and avoid the weird `tv_null`
indirection.

No changes in behaviour, just some clean-ups.
2021-02-10 14:14:37 +01:00
Luca Boccassi
8aa35d09d3 Fix coverity warning in test-string-util.c
CID 1446368:  Incorrect expression  (MISSING_COMMA)
2021-02-10 13:22:06 +01:00
Lennart Poettering
77552b9520 analyze: slightly reword PrivatTmp= message
Apparently there way confusion about "does not apply". Let's say "is not
appropriate".

Fixes: #13095
2021-02-10 12:14:29 +01:00
4 changed files with 34 additions and 27 deletions

View File

@ -31,3 +31,15 @@ about: A report of an error in a recent systemd version
**Steps to reproduce the problem** **Steps to reproduce the problem**
> … > …
**Additional program output to the terminal or log subsystem illustrating the issue**
<!-- Please paste relevant program terminal or journal output here, ideally
when generated in debug mode (try setting the SYSTEMD_LOG_LEVEL=debug
environment variable). For very long copy/pasted data consider using a
service like https://gist.github.com/. Where copy/paste is not possible
(for example early boot or late shutdown), a photo of the screen might do
too, but text is always much preferred. -->
```text
```

View File

@ -1545,7 +1545,7 @@ static int assess(const struct security_info *info, Table *overview_table, Analy
if (a->default_dependencies_only && !info->default_dependencies) { if (a->default_dependencies_only && !info->default_dependencies) {
badness = UINT64_MAX; badness = UINT64_MAX;
d = strdup("Service runs in special boot phase, option does not apply"); d = strdup("Service runs in special boot phase, option is not appropriate");
if (!d) if (!d)
return log_oom(); return log_oom();
} else { } else {

View File

@ -96,8 +96,7 @@ int clock_is_localtime(const char* adjtime_path) {
return false; return false;
} }
int clock_set_timezone(int *min) { int clock_set_timezone(int *ret_minutesdelta) {
const struct timeval *tv_null = NULL;
struct timespec ts; struct timespec ts;
struct tm tm; struct tm tm;
int minutesdelta; int minutesdelta;
@ -107,36 +106,32 @@ int clock_set_timezone(int *min) {
assert_se(localtime_r(&ts.tv_sec, &tm)); assert_se(localtime_r(&ts.tv_sec, &tm));
minutesdelta = tm.tm_gmtoff / 60; minutesdelta = tm.tm_gmtoff / 60;
tz.tz_minuteswest = -minutesdelta; tz = (struct timezone) {
tz.tz_dsttime = 0; /* DST_NONE */ .tz_minuteswest = -minutesdelta,
.tz_dsttime = 0, /* DST_NONE */
};
/* /* If the RTC does not run in UTC but in local time, the very first call to settimeofday() will set
* If the RTC does not run in UTC but in local time, the very first * the kernel's timezone and will warp the system clock, so that it runs in UTC instead of the local
* call to settimeofday() will set the kernel's timezone and will warp the * time we have read from the RTC. */
* system clock, so that it runs in UTC instead of the local time we if (settimeofday(NULL, &tz) < 0)
* have read from the RTC. return -errno;
*/
if (settimeofday(tv_null, &tz) < 0) if (ret_minutesdelta)
return negative_errno(); *ret_minutesdelta = minutesdelta;
if (min)
*min = minutesdelta;
return 0; return 0;
} }
int clock_reset_timewarp(void) { int clock_reset_timewarp(void) {
const struct timeval *tv_null = NULL; static const struct timezone tz = {
struct timezone tz; .tz_minuteswest = 0,
.tz_dsttime = 0, /* DST_NONE */
};
tz.tz_minuteswest = 0; /* The very first call to settimeofday() does time warp magic. Do a dummy call here, so the time
tz.tz_dsttime = 0; /* DST_NONE */ * warping is sealed and all later calls behave as expected. */
if (settimeofday(NULL, &tz) < 0)
/*
* The very first call to settimeofday() does time warp magic. Do a
* dummy call here, so the time warping is sealed and all later calls
* behave as expected.
*/
if (settimeofday(tv_null, &tz) < 0)
return -errno; return -errno;
return 0; return 0;

View File

@ -917,7 +917,7 @@ static void test_strverscmp_improved(void) {
"123-3.1", "123-3.1",
"123^patch1", "123^patch1",
"123^1", "123^1",
"123.a-1" "123.a-1",
"123.1-1", "123.1-1",
"123a-1", "123a-1",
"124", "124",