PERFORCE change 20706 for review

[Robert Watson]

http://perforce.freebsd.org/chv.cgi?CH=20706

Change 20706 by rwatson at rwatson_tislabs on 2002/11/05 10:09:57

	Integ a mis-merge fix from the main tree.

Affected files ...

.. //depot/projects/trustedbsd/base/sys/kern/kern_exec.c#24 integrate

Differences ...

==== //depot/projects/trustedbsd/base/sys/kern/kern_exec.c#24 (text+ko) ====

@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/kern/kern_exec.c,v 1.196 2002/11/05 17:51:55 rwatson Exp $
+ * $FreeBSD: src/sys/kern/kern_exec.c,v 1.197 2002/11/05 18:04:50 rwatson Exp $
  */
 
 #include "opt_ktrace.h"
@@ -691,11 +691,7 @@
 	} */ *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 @@
 	} */ *uap;
 {
 
+#ifdef MAC
 	return (kern_execve(td, uap->fname, uap->argv, uap->envv,
 	    uap->mac_p));
+#else
+	return (ENOSYS);
+#endif
 }
 
 int
To Unsubscribe: send mail to majordomo at trustedbsd.org
with "unsubscribe trustedbsd-cvs" in the body of the message