summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDale Rahn <drahn@cvs.openbsd.org>2003-06-03 18:04:09 +0000
committerDale Rahn <drahn@cvs.openbsd.org>2003-06-03 18:04:09 +0000
commit756e8d982ae0c9f0231dcf314009a79e709ca486 (patch)
tree71856f04a459a4b590ef167f56a56dc3cbeeb75b
parent67ddae3caa02026c5b58bfc0463fc1f31e845f3d (diff)
Disable random library ordering, this seems to be exposing bugs in other code.
-rw-r--r--libexec/ld.so/loader.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/libexec/ld.so/loader.c b/libexec/ld.so/loader.c
index 05dee673f38..8c2357396d3 100644
--- a/libexec/ld.so/loader.c
+++ b/libexec/ld.so/loader.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: loader.c,v 1.61 2003/05/30 19:07:34 drahn Exp $ */
+/* $OpenBSD: loader.c,v 1.62 2003/06/03 18:04:08 drahn Exp $ */
/*
* Copyright (c) 1998 Per Fogelstrom, Opsycon AB
@@ -282,6 +282,7 @@ _dl_boot(const char **argv, char **envp, const long loff, long *dl_data)
for (i = 0; i < libcnt; i++)
randomlist[i] = i;
+#ifdef NO_RANDOM_EXPOSES_BUGS_ELSEWHERE__
if (!_dl_norandom)
for (i = 1; i < libcnt; i++) {
unsigned int rnd;
@@ -295,6 +296,7 @@ _dl_boot(const char **argv, char **envp, const long loff, long *dl_data)
randomlist[rnd] = randomlist[i];
randomlist[i] = cur;
}
+#endif /* NO_RANDOM_EXPOSES_BUGS_ELSEWHERE__ */
for (i = 0; i < libcnt; i++) {
elf_object_t *depobj;