Merge pull request #15377 from poettering/userdb-no-shadow

author Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>

Sat, 11 Apr 2020 14:08:33 +0000 (16:08 +0200)

committer GitHub <noreply@github.com>

Sat, 11 Apr 2020 14:08:33 +0000 (16:08 +0200)
author Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Sat, 11 Apr 2020 14:08:33 +0000 (16:08 +0200)
committer GitHub <noreply@github.com>
Sat, 11 Apr 2020 14:08:33 +0000 (16:08 +0200)
diff --cc src/home/pam_systemd_home.c
Simple merge
diff --cc src/nss-systemd/nss-systemd.c
Simple merge
diff --cc src/shared/userdb.c
Simple merge
author	Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
	Sat, 11 Apr 2020 14:08:33 +0000 (16:08 +0200)
committer	GitHub <noreply@github.com>
	Sat, 11 Apr 2020 14:08:33 +0000 (16:08 +0200)
		1	2
src/home/pam_systemd_home.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/nss-systemd/nss-systemd.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/shared/userdb.c	patch \|	diff1 \|	diff2 \|	blob \| history