Module Name: src
Committed By: pooka
Date: Thu Mar 10 23:02:56 UTC 2011
Modified Files:
src/lib/librumphijack: hijack.c
Log Message:
Use rumphijack_dlsym() to figure out where __sysctl() is during
init. Otherwise powerpc dlsym() DTWT and returns NULL.
(now i have no idea why dlsym() it works from rcinit(), but i'll
opt to not care)
Hah, only took 15min to debug that crap this time around. I'm
quickly approaching zero-time with it.
To generate a diff of this commit:
cvs rdiff -u -r1.83 -r1.84 src/lib/librumphijack/hijack.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/librumphijack/hijack.c
diff -u src/lib/librumphijack/hijack.c:1.83 src/lib/librumphijack/hijack.c:1.84
--- src/lib/librumphijack/hijack.c:1.83 Thu Mar 10 09:47:32 2011
+++ src/lib/librumphijack/hijack.c Thu Mar 10 23:02:56 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: hijack.c,v 1.83 2011/03/10 09:47:32 pooka Exp $ */
+/* $NetBSD: hijack.c,v 1.84 2011/03/10 23:02:56 pooka Exp $ */
/*-
* Copyright (c) 2011 Antti Kantee. All Rights Reserved.
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: hijack.c,v 1.83 2011/03/10 09:47:32 pooka Exp $");
+__RCSID("$NetBSD: hijack.c,v 1.84 2011/03/10 23:02:56 pooka Exp $");
#define __ssp_weak_name(fun) _hijack_ ## fun
@@ -1870,7 +1870,7 @@
op___sysctl = GETSYSCALL(host, __SYSCTL);
/* we haven't inited yet */
if (__predict_false(op___sysctl == NULL)) {
- op___sysctl = dlsym(RTLD_NEXT, "__sysctl");
+ op___sysctl = rumphijack_dlsym(RTLD_NEXT, "__sysctl");
}
}
