summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.mailmap1
-rw-r--r--NEWS2
-rw-r--r--src/basic/locale-util.c2
-rw-r--r--src/journal/journal-file.c38
-rw-r--r--src/login/logind-dbus.c2
-rw-r--r--src/login/logind-device.c3
-rw-r--r--src/login/logind-seat-dbus.c2
-rw-r--r--src/login/logind-user-dbus.c2
-rw-r--r--src/resolve/resolved-dnstls-gnutls.c2
-rw-r--r--src/sysusers/sysusers.c2
10 files changed, 25 insertions, 31 deletions
diff --git a/.mailmap b/.mailmap
index 4764ad670a..28b60946ac 100644
--- a/.mailmap
+++ b/.mailmap
@@ -191,6 +191,7 @@ Yann E. Morin <yann.morin.1998@free.fr>
Yin Kangkai <kangkai.yin@intel.com> <kangkai.yin@linux.intel.com>
Zachary Winnerman <33329648+winnerman-pythian@users.noreply.github.com>
Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
+Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> <you@example.com>
Łukasz Stelmach <l.stelmach@samsung.com> <stlman@poczta.fm>
Jonathon Kowalski <bl0pbl33p@gmail.com>
Diego Canuhe <dcanuhe@gmail.com> <46734128+dcanuhe@users.noreply.github.com>
diff --git a/NEWS b/NEWS
index de4f93a79b..38287deee6 100644
--- a/NEWS
+++ b/NEWS
@@ -473,7 +473,7 @@ CHANGES WITH 243:
de Souza Cascardo, Theo Ouzhinski, Thiebaud Weksteen, Thomas Haller,
Thomas Weißschuh, Tomas Mraz, Tommi Rantala, Topi Miettinen, VD-Lycos,
ven, Wieland Hoffmann, William A. Kennington III, William Wold, Xi
- Ruoyao, Yuri Chornoivan, Yu Watanabe, Your Name, Zach Smith, Zbigniew
+ Ruoyao, Yuri Chornoivan, Yu Watanabe, Zach Smith, Zbigniew
Jędrzejewski-Szmek, Zhang Xianwei
– Camerino, 2019-09-03
diff --git a/src/basic/locale-util.c b/src/basic/locale-util.c
index 039e965bc4..e94c29939c 100644
--- a/src/basic/locale-util.c
+++ b/src/basic/locale-util.c
@@ -356,7 +356,7 @@ const char *special_glyph(SpecialGlyph code) {
[SPECIAL_GLYPH_SLIGHTLY_HAPPY_SMILEY] = ":-)",
[SPECIAL_GLYPH_NEUTRAL_SMILEY] = ":-|",
[SPECIAL_GLYPH_SLIGHTLY_UNHAPPY_SMILEY] = ":-(",
- [SPECIAL_GLYPH_UNHAPPY_SMILEY] = ":-{️",
+ [SPECIAL_GLYPH_UNHAPPY_SMILEY] = ":-{",
[SPECIAL_GLYPH_DEPRESSED_SMILEY] = ":-[",
},
diff --git a/src/journal/journal-file.c b/src/journal/journal-file.c
index dcce445e9c..db5664e4b3 100644
--- a/src/journal/journal-file.c
+++ b/src/journal/journal-file.c
@@ -3065,26 +3065,26 @@ void journal_file_print_header(JournalFile *f) {
assert(f);
assert(f->header);
- printf("File Path: %s\n"
+ printf("File path: %s\n"
"File ID: %s\n"
"Machine ID: %s\n"
"Boot ID: %s\n"
- "Sequential Number ID: %s\n"
+ "Sequential number ID: %s\n"
"State: %s\n"
- "Compatible Flags:%s%s\n"
- "Incompatible Flags:%s%s%s\n"
+ "Compatible flags:%s%s\n"
+ "Incompatible flags:%s%s%s\n"
"Header size: %"PRIu64"\n"
"Arena size: %"PRIu64"\n"
- "Data Hash Table Size: %"PRIu64"\n"
- "Field Hash Table Size: %"PRIu64"\n"
- "Rotate Suggested: %s\n"
- "Head Sequential Number: %"PRIu64" (%"PRIx64")\n"
- "Tail Sequential Number: %"PRIu64" (%"PRIx64")\n"
- "Head Realtime Timestamp: %s (%"PRIx64")\n"
- "Tail Realtime Timestamp: %s (%"PRIx64")\n"
- "Tail Monotonic Timestamp: %s (%"PRIx64")\n"
+ "Data hash table size: %"PRIu64"\n"
+ "Field hash table size: %"PRIu64"\n"
+ "Rotate suggested: %s\n"
+ "Head sequential number: %"PRIu64" (%"PRIx64")\n"
+ "Tail sequential number: %"PRIu64" (%"PRIx64")\n"
+ "Head realtime timestamp: %s (%"PRIx64")\n"
+ "Tail realtime timestamp: %s (%"PRIx64")\n"
+ "Tail monotonic timestamp: %s (%"PRIx64")\n"
"Objects: %"PRIu64"\n"
- "Entry Objects: %"PRIu64"\n",
+ "Entry objects: %"PRIu64"\n",
f->path,
sd_id128_to_string(f->header->file_id, a),
sd_id128_to_string(f->header->machine_id, b),
@@ -3112,22 +3112,22 @@ void journal_file_print_header(JournalFile *f) {
le64toh(f->header->n_entries));
if (JOURNAL_HEADER_CONTAINS(f->header, n_data))
- printf("Data Objects: %"PRIu64"\n"
- "Data Hash Table Fill: %.1f%%\n",
+ printf("Data objects: %"PRIu64"\n"
+ "Data hash table fill: %.1f%%\n",
le64toh(f->header->n_data),
100.0 * (double) le64toh(f->header->n_data) / ((double) (le64toh(f->header->data_hash_table_size) / sizeof(HashItem))));
if (JOURNAL_HEADER_CONTAINS(f->header, n_fields))
- printf("Field Objects: %"PRIu64"\n"
- "Field Hash Table Fill: %.1f%%\n",
+ printf("Field objects: %"PRIu64"\n"
+ "Field hash table fill: %.1f%%\n",
le64toh(f->header->n_fields),
100.0 * (double) le64toh(f->header->n_fields) / ((double) (le64toh(f->header->field_hash_table_size) / sizeof(HashItem))));
if (JOURNAL_HEADER_CONTAINS(f->header, n_tags))
- printf("Tag Objects: %"PRIu64"\n",
+ printf("Tag objects: %"PRIu64"\n",
le64toh(f->header->n_tags));
if (JOURNAL_HEADER_CONTAINS(f->header, n_entry_arrays))
- printf("Entry Array Objects: %"PRIu64"\n",
+ printf("Entry array objects: %"PRIu64"\n",
le64toh(f->header->n_entry_arrays));
if (fstat(f->fd, &st) >= 0)
diff --git a/src/login/logind-dbus.c b/src/login/logind-dbus.c
index 20a8591bd8..6b3f2a731b 100644
--- a/src/login/logind-dbus.c
+++ b/src/login/logind-dbus.c
@@ -163,7 +163,6 @@ int manager_get_user_from_creds(Manager *m, sd_bus_message *message, uid_t uid,
User *user;
assert(m);
- assert(message);
assert(ret);
if (!uid_is_valid(uid))
@@ -189,7 +188,6 @@ int manager_get_seat_from_creds(
int r;
assert(m);
- assert(message);
assert(ret);
if (SEAT_IS_SELF(name) || SEAT_IS_AUTO(name)) {
diff --git a/src/login/logind-device.c b/src/login/logind-device.c
index 20108544aa..9a62217290 100644
--- a/src/login/logind-device.c
+++ b/src/login/logind-device.c
@@ -91,14 +91,13 @@ void device_attach(Device *d, Seat *s) {
if (d->master || !s->devices)
LIST_PREPEND(devices, s->devices, d);
- else {
+ else
LIST_FOREACH(devices, i, s->devices) {
if (!i->devices_next || !i->master) {
LIST_INSERT_AFTER(devices, s->devices, i, d);
break;
}
}
- }
if (!had_master && d->master && s->started) {
seat_save(s);
diff --git a/src/login/logind-seat-dbus.c b/src/login/logind-seat-dbus.c
index 3c58929611..9958490875 100644
--- a/src/login/logind-seat-dbus.c
+++ b/src/login/logind-seat-dbus.c
@@ -280,8 +280,6 @@ int seat_object_find(sd_bus *bus, const char *path, const char *interface, void
return -ENOMEM;
message = sd_bus_get_current_message(bus);
- if (!message)
- return 0;
r = manager_get_seat_from_creds(m, message, e, error, &seat);
if (r == -ENXIO) {
diff --git a/src/login/logind-user-dbus.c b/src/login/logind-user-dbus.c
index beb97362e7..a6e2d4950d 100644
--- a/src/login/logind-user-dbus.c
+++ b/src/login/logind-user-dbus.c
@@ -244,8 +244,6 @@ int user_object_find(sd_bus *bus, const char *path, const char *interface, void
sd_bus_message *message;
message = sd_bus_get_current_message(bus);
- if (!message)
- return 0;
r = manager_get_user_from_creds(m, message, UID_INVALID, error, &user);
if (r == -ENXIO) {
diff --git a/src/resolve/resolved-dnstls-gnutls.c b/src/resolve/resolved-dnstls-gnutls.c
index 06d635fcc4..7ad9662073 100644
--- a/src/resolve/resolved-dnstls-gnutls.c
+++ b/src/resolve/resolved-dnstls-gnutls.c
@@ -10,7 +10,7 @@
#include "resolved-dnstls.h"
#if GNUTLS_VERSION_NUMBER >= 0x030600
-#define PRIORTY_STRING "NORMAL:-VERS-ALL:+VERS-TLS1.2:+VERS-TLS1.3"
+#define PRIORTY_STRING "NORMAL:-VERS-ALL:+VERS-TLS1.3:+VERS-TLS1.2"
#else
#define PRIORTY_STRING "NORMAL:-VERS-ALL:+VERS-TLS1.2"
#endif
diff --git a/src/sysusers/sysusers.c b/src/sysusers/sysusers.c
index 1fc1b0ae96..08a2df707b 100644
--- a/src/sysusers/sysusers.c
+++ b/src/sysusers/sysusers.c
@@ -528,7 +528,7 @@ static int write_temporary_shadow(const char *shadow_path, FILE **tmpfile, char
.sp_max = -1,
.sp_warn = -1,
.sp_inact = -1,
- .sp_expire = i->uid == 0 ? -1 : 1, /* lock account as a whole, unless this is root */
+ .sp_expire = -1,
.sp_flag = (unsigned long) -1, /* this appears to be what everybody does ... */
};
View Lorry Controller Status