1
0
mirror of https://github.com/systemd/systemd synced 2026-03-06 13:15:06 +01:00

Compare commits

...

7 Commits

Author SHA1 Message Date
shenyangyang4
b17f651a17 journalctl: don't skip the entries that have the same seqnum
These two judgement can't judge that two entries are repeating fully.
So i think seqnum is needed to make full judgement.
2020-12-15 18:07:11 +01:00
Gaurav
fa8342228b Fix review comments in added debug log. 2020-12-15 17:47:03 +01:00
Gaurav
d66b0ed4cc Fix build warning. 2020-12-15 17:47:03 +01:00
Gaurav
6ef03f7a0d Handle escape characters in interface name
Updated the patch as per review comments.
2020-12-15 17:47:03 +01:00
Gaurav
17f8a21fd0 Detect special character in dbus interface name
Added debug log to detect special character in dbus interface names.
Helps to detect a case mentioned in https://github.com/systemd/systemd/issues/14636
2020-12-15 17:47:03 +01:00
Fabian Affolter
04b2224957 Translated using Weblate (German)
Currently translated at 61.4% (115 of 187 strings)

Co-authored-by: Fabian Affolter <mail@fabian-affolter.ch>
Translate-URL: https://translate.fedoraproject.org/projects/systemd/master/de/
Translation: systemd/master
2020-12-15 17:40:56 +01:00
Ondrej Mosnacek
7b87bece5d resolved: create stub-resolv.conf symlink with correct security label
Use symlink_atomic_label() instead of symlink_atomic() as the symlink
may need a different label than the parent directory.

Signed-off-by: Ondrej Mosnacek <omosnace@redhat.com>
2020-12-15 14:12:08 +01:00
5 changed files with 28 additions and 15 deletions

View File

@ -4,21 +4,22 @@
# Christian Kirbach <Christian.Kirbach@gmail.com>, 2014, 2015. # Christian Kirbach <Christian.Kirbach@gmail.com>, 2014, 2015.
# Benjamin Steinwender <b@stbe.at>, 2014. # Benjamin Steinwender <b@stbe.at>, 2014.
# Bernd Homuth <dev@hmt.im>, 2015. # Bernd Homuth <dev@hmt.im>, 2015.
# # Fabian Affolter <mail@fabian-affolter.ch>, 2020.
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: systemd master\n" "Project-Id-Version: systemd master\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2020-08-19 18:02+0200\n" "POT-Creation-Date: 2020-08-19 18:02+0200\n"
"PO-Revision-Date: 2015-09-19 20:02+0200\n" "PO-Revision-Date: 2020-12-13 14:36+0000\n"
"Last-Translator: Bernd Homuth <dev@hmt.im>\n" "Last-Translator: Fabian Affolter <mail@fabian-affolter.ch>\n"
"Language-Team: Deutsch <gnome-de@gnome.org>\n" "Language-Team: German <https://translate.fedoraproject.org/projects/systemd/"
"master/de/>\n"
"Language: de\n" "Language: de\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n" "Plural-Forms: nplurals=2; plural=n != 1;\n"
"X-Generator: Gtranslator 2.91.6\n" "X-Generator: Weblate 4.3.2\n"
#: src/core/org.freedesktop.systemd1.policy.in:22 #: src/core/org.freedesktop.systemd1.policy.in:22
msgid "Send passphrase back to system" msgid "Send passphrase back to system"
@ -72,7 +73,7 @@ msgstr "Legitimierung ist zum erneuten Laden des systemd-Zustands notwendig."
#: src/home/org.freedesktop.home1.policy:13 #: src/home/org.freedesktop.home1.policy:13
msgid "Create a home area" msgid "Create a home area"
msgstr "" msgstr "Zuhause-Bereich erzeugen"
#: src/home/org.freedesktop.home1.policy:14 #: src/home/org.freedesktop.home1.policy:14
#, fuzzy #, fuzzy
@ -82,7 +83,7 @@ msgstr "Legitimierung ist zum erneuten Laden des systemd-Zustands notwendig."
#: src/home/org.freedesktop.home1.policy:23 #: src/home/org.freedesktop.home1.policy:23
msgid "Remove a home area" msgid "Remove a home area"
msgstr "" msgstr "Zuhause-Bereich entfernen"
#: src/home/org.freedesktop.home1.policy:24 #: src/home/org.freedesktop.home1.policy:24
#, fuzzy #, fuzzy
@ -92,7 +93,7 @@ msgstr "Legitimierung ist zum erneuten Laden des systemd-Zustands notwendig."
#: src/home/org.freedesktop.home1.policy:33 #: src/home/org.freedesktop.home1.policy:33
msgid "Check credentials of a home area" msgid "Check credentials of a home area"
msgstr "" msgstr "Prüfen Sie die Zugangsdaten für den Zuhause-Bereich"
# https://www.freedesktop.org/software/systemd/man/sd-login.html # https://www.freedesktop.org/software/systemd/man/sd-login.html
#: src/home/org.freedesktop.home1.policy:34 #: src/home/org.freedesktop.home1.policy:34
@ -107,7 +108,7 @@ msgstr ""
#: src/home/org.freedesktop.home1.policy:43 #: src/home/org.freedesktop.home1.policy:43
msgid "Update a home area" msgid "Update a home area"
msgstr "" msgstr "Zuhause-Bereich aktualisieren"
# https://www.freedesktop.org/software/systemd/man/sd-login.html # https://www.freedesktop.org/software/systemd/man/sd-login.html
#: src/home/org.freedesktop.home1.policy:44 #: src/home/org.freedesktop.home1.policy:44

View File

@ -2741,12 +2741,14 @@ int journal_file_compare_locations(JournalFile *af, JournalFile *bf) {
assert(af->location_type == LOCATION_SEEK); assert(af->location_type == LOCATION_SEEK);
assert(bf->location_type == LOCATION_SEEK); assert(bf->location_type == LOCATION_SEEK);
/* If contents and timestamps match, these entries are /* If contents, timestamps and seqnum match, these entries are
* identical, even if the seqnum does not match */ * identical*/
if (sd_id128_equal(af->current_boot_id, bf->current_boot_id) && if (sd_id128_equal(af->current_boot_id, bf->current_boot_id) &&
af->current_monotonic == bf->current_monotonic && af->current_monotonic == bf->current_monotonic &&
af->current_realtime == bf->current_realtime && af->current_realtime == bf->current_realtime &&
af->current_xor_hash == bf->current_xor_hash) af->current_xor_hash == bf->current_xor_hash &&
sd_id128_equal(af->header->seqnum_id, bf->header->seqnum_id) &&
af->current_seqnum == bf->current_seqnum)
return 0; return 0;
if (sd_id128_equal(af->header->seqnum_id, bf->header->seqnum_id)) { if (sd_id128_equal(af->header->seqnum_id, bf->header->seqnum_id)) {

View File

@ -448,6 +448,9 @@ _pure_ static int compare_with_location(const JournalFile *f, const Location *l,
f->current_realtime == l->realtime && f->current_realtime == l->realtime &&
l->xor_hash_set && l->xor_hash_set &&
f->current_xor_hash == l->xor_hash && f->current_xor_hash == l->xor_hash &&
l->seqnum_set &&
sd_id128_equal(f->header->seqnum_id, l->seqnum_id) &&
f->current_seqnum == l->seqnum &&
f != current_file) f != current_file)
return 0; return 0;

View File

@ -3,6 +3,7 @@
#include "alloc-util.h" #include "alloc-util.h"
#include "bus-internal.h" #include "bus-internal.h"
#include "bus-message.h" #include "bus-message.h"
#include "escape.h"
#include "hexdecoct.h" #include "hexdecoct.h"
#include "string-util.h" #include "string-util.h"
@ -91,8 +92,13 @@ bool interface_name_is_valid(const char *p) {
(!dot && *q >= '0' && *q <= '9') || (!dot && *q >= '0' && *q <= '9') ||
*q == '_'; *q == '_';
if (!good) if (!good) {
if (DEBUG_LOGGING) {
_cleanup_free_ char *iface = cescape(p);
log_debug("The interface %s is invalid as it contains special character", strnull(iface));
}
return false; return false;
}
dot = false; dot = false;
} }

View File

@ -10,6 +10,7 @@
#include "fd-util.h" #include "fd-util.h"
#include "fileio.h" #include "fileio.h"
#include "fs-util.h" #include "fs-util.h"
#include "label.h"
#include "ordered-set.h" #include "ordered-set.h"
#include "resolved-conf.h" #include "resolved-conf.h"
#include "resolved-dns-server.h" #include "resolved-dns-server.h"
@ -364,7 +365,7 @@ int manager_write_resolv_conf(Manager *m) {
log_error_errno(r, "Failed to move new %s into place: %m", PRIVATE_STUB_RESOLV_CONF); log_error_errno(r, "Failed to move new %s into place: %m", PRIVATE_STUB_RESOLV_CONF);
} else { } else {
r = symlink_atomic(basename(PRIVATE_UPLINK_RESOLV_CONF), PRIVATE_STUB_RESOLV_CONF); r = symlink_atomic_label(basename(PRIVATE_UPLINK_RESOLV_CONF), PRIVATE_STUB_RESOLV_CONF);
if (r < 0) if (r < 0)
log_error_errno(r, "Failed to symlink %s: %m", PRIVATE_STUB_RESOLV_CONF); log_error_errno(r, "Failed to symlink %s: %m", PRIVATE_STUB_RESOLV_CONF);
} }