Put on my peril sensitive sunglasses and add a flags field to the internal

sysctl routines and state.  Add some code to use it for signalling the need
to downconvert a data structure to 32 bits on a 64 bit OS when requested by
a 32 bit app.

I tried to do this in a generic abi wrapper that intercepted the sysctl
oid's, or looked up the format string etc, but it was a real can of worms
that turned into a fragile mess before I even got it partially working.

With this, we can now run 'sysctl -a' on a 32 bit sysctl binary and have
it not abort.  Things like netstat, ps, etc have a long way to go.

This also fixes a bug in the kern.ps_strings and kern.usrstack hacks.
These do matter very much because they are used by libc_r and other things.

1 files changed, 4 insertions, 4 deletions

diff --git a/sys/kern/kern_exec.c b/sys/kern/kern_exec.c
index d236832..06cbc68 100644
--- a/sys/kern/kern_exec.c
+++ b/sys/kern/kern_exec.c
@@ -104,8 +104,8 @@ sysctl_kern_ps_strings(SYSCTL_HANDLER_ARGS)
 	int error;
 
 	p = curproc;
-#if defined(__amd64__) || defined(__ia64__)
-	if (req->oldlen == sizeof(unsigned int)) {
+#ifdef SCTL_MASK32
+	if (req->flags & SCTL_MASK32) {
 		unsigned int val;
 		val = (unsigned int)p->p_sysent->sv_psstrings;
 		error = SYSCTL_OUT(req, &val, sizeof(val));
@@ -123,8 +123,8 @@ sysctl_kern_usrstack(SYSCTL_HANDLER_ARGS)
 	int error;
 
 	p = curproc;
-#if defined(__amd64__) || defined(__ia64__)
-	if (req->oldlen == sizeof(unsigned int)) {
+#ifdef SCTL_MASK32
+	if (req->flags & SCTL_MASK32) {
 		unsigned int val;
 		val = (unsigned int)p->p_sysent->sv_usrstack;
 		error = SYSCTL_OUT(req, &val, sizeof(val));