Merge pull request #408 from bjorn-fischer/ambient_caps

author Serge Hallyn <serge@hallyn.com>

Sun, 5 Dec 2021 14:05:06 +0000 (08:05 -0600)

committer GitHub <noreply@github.com>

Sun, 5 Dec 2021 14:05:06 +0000 (08:05 -0600)
author Serge Hallyn <serge@hallyn.com>
Sun, 5 Dec 2021 14:05:06 +0000 (08:05 -0600)
committer GitHub <noreply@github.com>
Sun, 5 Dec 2021 14:05:06 +0000 (08:05 -0600)
diff --cc src/login.c
Simple merge
diff --cc src/su.c
Simple merge
author	Serge Hallyn <serge@hallyn.com>
	Sun, 5 Dec 2021 14:05:06 +0000 (08:05 -0600)
committer	GitHub <noreply@github.com>
	Sun, 5 Dec 2021 14:05:06 +0000 (08:05 -0600)
		1	2
src/login.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/su.c	patch \|	diff1 \|	diff2 \|	blob \| history