From 998f22c37c356bcdc62d9999f0082ae9350ebb1f Mon Sep 17 00:00:00 2001
From: deraadt <deraadt@openbsd.org>
Date: Fri, 8 Dec 2017 05:25:20 +0000
Subject: [PATCH] Everyone knows this as ld.so, nor by the ancient name rtld.
 ok guenther

---
 libexec/ld.so/dlfcn.c          | 4 ++--
 libexec/ld.so/library.c        | 8 ++++----
 libexec/ld.so/library_mquery.c | 4 ++--
 libexec/ld.so/loader.c         | 4 ++--
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/libexec/ld.so/dlfcn.c b/libexec/ld.so/dlfcn.c
index 79956925cf2..8a6eab81ac1 100644
--- a/libexec/ld.so/dlfcn.c
+++ b/libexec/ld.so/dlfcn.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dlfcn.c,v 1.99 2017/11/28 17:19:47 kettenis Exp $ */
+/*	$OpenBSD: dlfcn.c,v 1.100 2017/12/08 05:25:20 deraadt Exp $ */
 
 /*
  * Copyright (c) 1998 Per Fogelstrom, Opsycon AB
@@ -509,7 +509,7 @@ _dl_show_objects(void)
 	for (; object != NULL; object = object->next) {
 		switch (object->obj_type) {
 		case OBJTYPE_LDR:
-			objtypename = "rtld";
+			objtypename = "ld.so";
 			break;
 		case OBJTYPE_EXE:
 			objtypename = "exe ";
diff --git a/libexec/ld.so/library.c b/libexec/ld.so/library.c
index a3be32c1ba0..c8f2b572c93 100644
--- a/libexec/ld.so/library.c
+++ b/libexec/ld.so/library.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: library.c,v 1.81 2017/02/08 04:34:29 guenther Exp $ */
+/*	$OpenBSD: library.c,v 1.82 2017/12/08 05:25:20 deraadt Exp $ */
 
 /*
  * Copyright (c) 2002 Dale Rahn
@@ -198,7 +198,7 @@ _dl_tryload_shlib(const char *libname, int type, int flags)
 	libaddr = (Elf_Addr)_dl_mmap(0, maxva - minva, PROT_NONE,
 	    MAP_PRIVATE|MAP_FILE, libfile, 0);
 	if (_dl_mmap_error(libaddr)) {
-		_dl_printf("%s: rtld mmap failed mapping %s.\n",
+		_dl_printf("%s: ld.so mmap failed mapping %s.\n",
 		    __progname, libname);
 		_dl_close(libfile);
 		_dl_errno = DL_CANT_MMAP;
@@ -243,7 +243,7 @@ _dl_tryload_shlib(const char *libname, int type, int flags)
 			next_load->size = size;
 			next_load->prot = PFLAGS(phdp->p_flags);
 			if (size != 0 && _dl_mmap_error(res)) {
-				_dl_printf("%s: rtld mmap failed mapping %s.\n",
+				_dl_printf("%s: ld.so mmap failed mapping %s.\n",
 				    __progname, libname);
 				_dl_close(libfile);
 				_dl_errno = DL_CANT_MMAP;
@@ -265,7 +265,7 @@ _dl_tryload_shlib(const char *libname, int type, int flags)
 				res = _dl_mmap(start, size, flags,
 				    MAP_FIXED|MAP_PRIVATE|MAP_ANON, -1, 0);
 				if (_dl_mmap_error(res)) {
-					_dl_printf("%s: rtld mmap failed mapping %s.\n",
+					_dl_printf("%s: ld.so mmap failed mapping %s.\n",
 					    __progname, libname);
 					_dl_close(libfile);
 					_dl_errno = DL_CANT_MMAP;
diff --git a/libexec/ld.so/library_mquery.c b/libexec/ld.so/library_mquery.c
index 65b04557a27..a01d43af83e 100644
--- a/libexec/ld.so/library_mquery.c
+++ b/libexec/ld.so/library_mquery.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: library_mquery.c,v 1.57 2017/01/24 07:48:36 guenther Exp $ */
+/*	$OpenBSD: library_mquery.c,v 1.58 2017/12/08 05:25:20 deraadt Exp $ */
 
 /*
  * Copyright (c) 2002 Dale Rahn
@@ -332,7 +332,7 @@ retry:
 	}
 	return(object);
 fail:
-	_dl_printf("%s: rtld mmap failed mapping %s.\n", __progname, libname);
+	_dl_printf("%s: ld.so mmap failed mapping %s.\n", __progname, libname);
 	_dl_close(libfile);
 	_dl_errno = DL_CANT_MMAP;
 	_dl_load_list_free(lowld);
diff --git a/libexec/ld.so/loader.c b/libexec/ld.so/loader.c
index e118e097964..0bc2a4139d7 100644
--- a/libexec/ld.so/loader.c
+++ b/libexec/ld.so/loader.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: loader.c,v 1.171 2017/10/26 20:17:05 guenther Exp $ */
+/*	$OpenBSD: loader.c,v 1.172 2017/12/08 05:25:20 deraadt Exp $ */
 
 /*
  * Copyright (c) 1998 Per Fogelstrom, Opsycon AB
@@ -412,7 +412,7 @@ _dl_boot(const char **argv, char **envp, const long dyn_loff, long *dl_data)
 		_dl___syscall(SYS_kbind, (void *)NULL, (size_t)0, (long long)0);
 	}
 
-	DL_DEB(("rtld loading: '%s'\n", __progname));
+	DL_DEB(("ld.so loading: '%s'\n", __progname));
 
 	/* init this in runtime, not statically */
 	TAILQ_INIT(&_dlopened_child_list);
-- 
2.20.1