diff options
| author | rwatson <rwatson@FreeBSD.org> | 2002-11-05 18:04:50 +0000 |
|---|---|---|
| committer | rwatson <rwatson@FreeBSD.org> | 2002-11-05 18:04:50 +0000 |
| commit | 80fa5afdadaf63dd94e85e760046b2148a8d6622 (patch) | |
| tree | 6714ea277d6466b93e56f60248e153cb6d12a646 /sys/kern/kern_exec.c | |
| parent | d575478d80347ff57b672ba56f55bdd1f91334b1 (diff) | |
| download | FreeBSD-src-80fa5afdadaf63dd94e85e760046b2148a8d6622.zip FreeBSD-src-80fa5afdadaf63dd94e85e760046b2148a8d6622.tar.gz | |
Correct merge-o: disable the right execve() variation if !MAC
Diffstat (limited to 'sys/kern/kern_exec.c')
| -rw-r--r-- | sys/kern/kern_exec.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sys/kern/kern_exec.c b/sys/kern/kern_exec.c index d97ed31..0241c4d 100644 --- a/sys/kern/kern_exec.c +++ b/sys/kern/kern_exec.c @@ -691,11 +691,7 @@ execve(td, uap) } */ *uap; { -#ifdef MAC return (kern_execve(td, uap->fname, uap->argv, uap->envv, NULL)); -#else - return (ENOSYS); -#endif } #ifndef _SYS_SYSPROTO_H_ @@ -721,8 +717,12 @@ __mac_execve(td, uap) } */ *uap; { +#ifdef MAC return (kern_execve(td, uap->fname, uap->argv, uap->envv, uap->mac_p)); +#else + return (ENOSYS); +#endif } int |
