summaryrefslogtreecommitdiff
path: root/libexec
diff options
context:
space:
mode:
authorDale Rahn <drahn@cvs.openbsd.org>2006-05-05 14:34:28 +0000
committerDale Rahn <drahn@cvs.openbsd.org>2006-05-05 14:34:28 +0000
commit33e24ee393678448177942273d52ccf495833bfe (patch)
tree954d5927abd97517dae7bc3d75547e34c0d6b83d /libexec
parentf8e349d9dede8286eda154f8d3429a5ea195678f (diff)
Prebind should not force lazy binding to be turned off during dlopen()
the presense of LD_BIND_NOW should control that. Fixes the X server.
Diffstat (limited to 'libexec')
-rw-r--r--libexec/ld.so/dl_prebind.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/libexec/ld.so/dl_prebind.c b/libexec/ld.so/dl_prebind.c
index 870e33972f0..402561394dd 100644
--- a/libexec/ld.so/dl_prebind.c
+++ b/libexec/ld.so/dl_prebind.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dl_prebind.c,v 1.3 2006/05/05 04:45:02 drahn Exp $ */
+/* $OpenBSD: dl_prebind.c,v 1.4 2006/05/05 14:34:27 drahn Exp $ */
/*
* Copyright (c) 2006 Dale Rahn <drahn@dalerahn.com>
*
@@ -384,6 +384,9 @@ prebind_free(elf_object_t *object)
object->prebind_data = NULL;
_dl_prog_prebind_map = NULL;
+
+ if (_dl_bindnow == prebind_bind_now)
+ _dl_bindnow = NULL;
}
}