diff options
Diffstat (limited to 'proc')
| -rw-r--r-- | proc/info.c | 7 | ||||
| -rw-r--r-- | proc/mgt.c | 27 | ||||
| -rw-r--r-- | proc/proc.h | 2 |
3 files changed, 9 insertions, 27 deletions
diff --git a/proc/info.c b/proc/info.c index ab74fb39..c2d7ad67 100644 --- a/proc/info.c +++ b/proc/info.c @@ -500,6 +500,7 @@ S_proc_getprocinfo (struct proc *callerp, struct proc *tp; task_t task; /* P's task port. */ mach_port_t msgport; /* P's msgport, or MACH_PORT_NULL if none. */ + int owned; /* No need to check CALLERP here; we don't use it. */ @@ -624,6 +625,8 @@ S_proc_getprocinfo (struct proc *callerp, *piarraylen = structsize / sizeof (int); pi = (struct procinfo *) *piarray; + owned = p->p_id && p->p_id->i_nuids; + pi->state = ((p->p_stopped ? PI_STOPPED : 0) | (p->p_exec ? PI_EXECED : 0) @@ -631,12 +634,12 @@ S_proc_getprocinfo (struct proc *callerp, | (!p->p_pgrp->pg_orphcnt ? PI_ORPHAN : 0) | (p->p_msgport == MACH_PORT_NULL ? PI_NOMSG : 0) | (p->p_pgrp->pg_session->s_sid == p->p_pid ? PI_SESSLD : 0) - | (p->p_noowner ? PI_NOTOWNED : 0) + | (owned ? 0 : PI_NOTOWNED) | (!p->p_parentset ? PI_NOPARENT : 0) | (p->p_traced ? PI_TRACED : 0) | (p->p_msgportwait ? PI_GETMSG : 0) | (p->p_loginleader ? PI_LOGINLD : 0)); - pi->owner = p->p_owner; + pi->owner = owned ? p->p_id->i_uids[0] : 0; pi->ppid = p->p_parent->p_pid; pi->pgrp = p->p_pgrp->pg_pgid; pi->session = p->p_pgrp->pg_session->s_sid; @@ -186,9 +186,6 @@ S_proc_child (struct proc *parentp, childp->p_login = parentp->p_login; childp->p_login->l_refcnt++; - childp->p_owner = parentp->p_owner; - childp->p_noowner = parentp->p_noowner; - ids_rele (childp->p_id); ids_ref (parentp->p_id); childp->p_id = parentp->p_id; @@ -432,27 +429,13 @@ S_proc_reauthenticate_reassign (struct proc *p, return err; } -/* Implement proc_setowner as described in <hurd/process.defs>. */ kern_return_t S_proc_setowner (struct proc *p, - uid_t owner, - int clear) + uid_t owner, + int clear) { - if (!p) - return EOPNOTSUPP; - - if (clear) - p->p_noowner = 1; - else - { - if (! check_uid (p, owner)) - return EPERM; - - p->p_owner = owner; - p->p_noowner = 0; - } - - return 0; + /* No longer does anything, kept for compatibility. */ + return EOPNOTSUPP; } /* Implement proc_getpids as described in <hurd/process.defs>. */ @@ -859,8 +842,6 @@ complete_proc (struct proc *p, pid_t pid) p->p_ochild = 0; p->p_parentset = 0; - p->p_noowner = 1; - p->p_pgrp = init_proc->p_pgrp; /* At this point, we do not know the task of the startup process, diff --git a/proc/proc.h b/proc/proc.h index cafcfaff..a83a5090 100644 --- a/proc/proc.h +++ b/proc/proc.h @@ -44,7 +44,6 @@ struct proc task_t p_task; pid_t p_pid; struct login *p_login; - uid_t p_owner; struct ids *p_id; /* Process hierarchy */ @@ -90,7 +89,6 @@ struct proc unsigned int p_deadmsg:1; /* hang on requests for a message port */ unsigned int p_checkmsghangs:1; /* someone is currently hanging on us */ unsigned int p_msgportwait:1; /* blocked in getmsgport */ - unsigned int p_noowner:1; /* has no owner known */ unsigned int p_loginleader:1; /* leader of login collection */ unsigned int p_dead:1; /* process is dead */ unsigned int p_important:1; /* has called proc_mark_important */ |