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]        = ":-[",
                 },
 

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)

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 = -1,
+                        .sp_expire = i->uid == 0 ? -1 : 1, /* lock account as a whole, unless this is root */
                         .sp_flag = (unsigned long) -1, /* this appears to be what everybody does ... */
                 };