From: kn <kn@openbsd.org>
Date: Wed, 28 Dec 2022 09:53:33 +0000 (+0000)
Subject: Make wait_reorder_libs() honour library_aslr=NO
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=0b442041eb1015b9d7d6e58316ee7d54d6996582;p=openbsd

Make wait_reorder_libs() honour library_aslr=NO

Otherwise it will unconditionally print an empty line in case relinking
is disabled.

Reported by kettenis
Feedback OK tb
OK florian
---

diff --git a/etc/rc b/etc/rc
index 149d6f5a33a..d4379e5ad91 100644
--- a/etc/rc
+++ b/etc/rc
@@ -1,4 +1,4 @@
-#	$OpenBSD: rc,v 1.567 2022/12/26 20:24:43 kn Exp $
+#	$OpenBSD: rc,v 1.568 2022/12/28 09:53:33 kn Exp $
 
 # System startup script run by init on autoboot or after single-user.
 # Output and error are redirected to console by init, and the console is the
@@ -255,6 +255,8 @@ reorder_libs() {
 wait_reorder_libs() {
 	local _line
 
+	[[ $library_aslr == NO ]] && return
+
 	while IFS= read -p _line; do
 		echo -n "$_line"
 	done