From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Mon, 21 Oct 2019 14:26:42 +0000 (+0200)
Subject: Revert "sysusers: properly mark generated accounts as locked"
X-Git-Tag: archive/raspbian/243-7+rpi1^2~23
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=d55df52c1025825f4b8bf53c2c28ccf3e6ad207d;p=systemd.git

Revert "sysusers: properly mark generated accounts as locked"

This reverts the gist of commit 636e72bce63e7e99b76357f7d524d16f61558775.
The comment and the tiny cleanup are left alone.

We shouldn't lock the accounts because people actually need to use them, and
if they are locked, various tools will refuse.
See https://github.com/systemd/systemd/pull/13277#issuecomment-529964578
and follow-up comments.

(cherry picked from commit 12c829376a95ee0a734b8dbd347042062516f0a9)

Gbp-Pq: Name Revert-sysusers-properly-mark-generated-accounts-as-locke.patch
---

diff --git a/src/sysusers/sysusers.c b/src/sysusers/sysusers.c
index 1fc1b0ae..08a2df70 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 ... */
                 };