BSD 4_4 release

[unix-history] / usr / src / sys / kern / kern_exec.c

diff --git a/usr/src/sys/kern/kern_exec.c b/usr/src/sys/kern/kern_exec.c
index a50d3d2..3e42073 100644 (file)
--- a/usr/src/sys/kern/kern_exec.c
+++ b/usr/src/sys/kern/kern_exec.c
@@ -1,10 +1,12 @@
 /*-
 /*-

- * Copyright (c) 1982, 1986, 1991 The Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1982, 1986, 1991, 1993
+ *     The Regents of the University of California.  All rights reserved.

  *
  *

- * %sccs.include.proprietary.c%
+ * This module is believed to contain source code proprietary to AT&T.
+ * Use and redistribution is subject to the Berkeley Software License
+ * Agreement and your Software Agreement with AT&T (Western Electric).

  *
  *

- *     @(#)kern_exec.c 7.76 (Berkeley) %G%
+ *     @(#)kern_exec.c 8.1 (Berkeley) 6/10/93

  */
 
 #include <sys/param.h>
  */
 
 #include <sys/param.h>


@@ -85,9 +87,6 @@ execve(p, uap, retval)
 #endif
        struct nameidata nd;
        struct ps_strings ps;
 #endif
        struct nameidata nd;
        struct ps_strings ps;

-#ifdef SECSIZE
-       extern long argdbsize;                  /* XXX */
-#endif SECSIZE

 
        NDINIT(&nd, LOOKUP, FOLLOW | SAVENAME, UIO_USERSPACE,
                uap->fname, p);
 
        NDINIT(&nd, LOOKUP, FOLLOW | SAVENAME, UIO_USERSPACE,
                uap->fname, p);


@@ -490,7 +489,6 @@ bad:
        FREE(nd.ni_cnd.cn_pnbuf, M_NAMEI);
        if (execargs)
                kmem_free_wakeup(exec_map, execargs, NCARGS);
        FREE(nd.ni_cnd.cn_pnbuf, M_NAMEI);
        if (execargs)
                kmem_free_wakeup(exec_map, execargs, NCARGS);

-#endif SECSIZE

        if (vp)
                vput(vp);
        return (error);
        if (vp)
                vput(vp);
        return (error);