summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2019-10-21 16:26:42 +0200
committerYu Watanabe <watanabe.yu+github@gmail.com>2019-10-22 17:59:11 +0900
commit12c829376a95ee0a734b8dbd347042062516f0a9 (patch)
treecdc482187d5e4fb0e3304243cb3d40e135a245c5
parent2c54acb1129886479218db26f9abe5f58762c57a (diff)
downloadsystemd-12c829376a95ee0a734b8dbd347042062516f0a9.tar.gz
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.
-rw-r--r--src/sysusers/sysusers.c2
1 files changed, 1 insertions, 1 deletions
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 ... */
};