diff options
author | rwatson <rwatson@FreeBSD.org> | 2001-11-08 02:13:18 +0000 |
---|---|---|
committer | rwatson <rwatson@FreeBSD.org> | 2001-11-08 02:13:18 +0000 |
commit | 8cf42b482a9aa3f9ec41071c44bc18a0ea425abf (patch) | |
tree | f48964de5180c6b27c3272456da3b93d16bd1ea3 /sys/kern/kern_sysctl.c | |
parent | c4a9f1d3ab184e9dddf4227f8e0781b59d1a82b7 (diff) | |
download | FreeBSD-src-8cf42b482a9aa3f9ec41071c44bc18a0ea425abf.zip FreeBSD-src-8cf42b482a9aa3f9ec41071c44bc18a0ea425abf.tar.gz |
o Replace reference to 'struct proc' with 'struct thread' in 'struct
sysctl_req', which describes in-progress sysctl requests. This permits
sysctl handlers to have access to the current thread, permitting work
on implementing td->td_ucred, migration of suser() to using struct
thread to derive the appropriate ucred, and allowing struct thread to be
passed down to other code, such as network code where td is not currently
available (and curproc is used).
o Note: netncp and netsmb are not updated to reflect this change, as they
are not currently KSE-adapted.
Reviewed by: julian
Obtained from: TrustedBSD Project
Diffstat (limited to 'sys/kern/kern_sysctl.c')
-rw-r--r-- | sys/kern/kern_sysctl.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sys/kern/kern_sysctl.c b/sys/kern/kern_sysctl.c index 03b5a95..e1b41b3 100644 --- a/sys/kern/kern_sysctl.c +++ b/sys/kern/kern_sysctl.c @@ -848,7 +848,7 @@ kernel_sysctl(struct thread *td, int *name, u_int namelen, void *old, bzero(&req, sizeof req); - req.p = td->td_proc; + req.td = td; if (oldlenp) { req.oldlen = *oldlenp; @@ -1037,12 +1037,12 @@ sysctl_root(SYSCTL_HANDLER_ARGS) /* Is this sysctl sensitive to securelevels? */ if (req->newptr && (oid->oid_kind & CTLFLAG_SECURE)) { - if (req->p == NULL) { + if (req->td == NULL) { error = securelevel_gt(NULL, 0); /* XXX */ if (error) return (error); } else { - error = securelevel_gt(req->p->p_ucred, 0); + error = securelevel_gt(req->td->td_proc->p_ucred, 0); if (error) return (error); } @@ -1050,14 +1050,14 @@ sysctl_root(SYSCTL_HANDLER_ARGS) /* Is this sysctl writable by only privileged users? */ if (req->newptr && !(oid->oid_kind & CTLFLAG_ANYBODY)) { - if (req->p != NULL) { + if (req->td != NULL) { int flags; if (oid->oid_kind & CTLFLAG_PRISON) flags = PRISON_ROOT; else flags = 0; - error = suser_xxx(NULL, req->p, flags); + error = suser_xxx(NULL, req->td->td_proc, flags); if (error) return (error); } @@ -1132,7 +1132,7 @@ userland_sysctl(struct thread *td, int *name, u_int namelen, void *old, bzero(&req, sizeof req); - req.p = td->td_proc; + req.td = td; if (oldlenp) { if (inkernel) { |