merge in vnodes

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

diff --git a/usr/src/sys/kern/kern_xxx.c b/usr/src/sys/kern/kern_xxx.c
index 64ce7f1..94b655b 100644 (file)
--- a/usr/src/sys/kern/kern_xxx.c
+++ b/usr/src/sys/kern/kern_xxx.c
@@ -1,14 +1,24 @@
 /*
 /*

- * Copyright (c) 1982, 1986 Regents of the University of California.
- * All rights reserved.  The Berkeley software License Agreement
- * specifies the terms and conditions for redistribution.
+ * Copyright (c) 1982, 1986, 1989 Regents of the University of California.
+ * All rights reserved.

  *
  *

- *     @(#)kern_xxx.c  7.3 (Berkeley) %G%
+ * Redistribution and use in source and binary forms are permitted
+ * provided that the above copyright notice and this paragraph are
+ * duplicated in all such forms and that any documentation,
+ * advertising materials, and other materials related to such
+ * distribution and use acknowledge that the software was developed
+ * by the University of California, Berkeley.  The name of the
+ * University may not be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ *     @(#)kern_xxx.c  7.7 (Berkeley) %G%

  */
 
 #include "param.h"
 #include "systm.h"
  */
 
 #include "param.h"
 #include "systm.h"

-#include "dir.h"

 #include "user.h"
 #include "kernel.h"
 #include "proc.h"
 #include "user.h"
 #include "kernel.h"
 #include "proc.h"


@@ -26,8 +36,6 @@ sethostid()
                long    hostid;
        } *uap = (struct a *)u.u_ap;
 
                long    hostid;
        } *uap = (struct a *)u.u_ap;
 

-       if (suser())
-               hostid = uap->hostid;

 }
 
 gethostname()
 }
 
 gethostname()


@@ -36,12 +44,11 @@ gethostname()
                char    *hostname;
                u_int   len;
        } *uap = (struct a *)u.u_ap;
                char    *hostname;
                u_int   len;
        } *uap = (struct a *)u.u_ap;

-       register u_int len;

 
 

-       len = uap->len;
-       if (len > hostnamelen + 1)
-               len = hostnamelen + 1;
-       u.u_error = copyout((caddr_t)hostname, (caddr_t)uap->hostname, len);
+       if (uap->len > hostnamelen + 1)
+               uap->len = hostnamelen + 1;
+       u.u_error = copyout((caddr_t)hostname, (caddr_t)uap->hostname,
+               uap->len);

 }
 
 sethostname()
 }
 
 sethostname()


@@ -51,7 +58,6 @@ sethostname()
                u_int   len;
        } *uap = (struct a *)u.u_ap;
 
                u_int   len;
        } *uap = (struct a *)u.u_ap;
 

-       if (!suser())

                return;
        if (uap->len > sizeof (hostname) - 1) {
                u.u_error = EINVAL;
                return;
        if (uap->len > sizeof (hostname) - 1) {
                u.u_error = EINVAL;


@@ -68,6 +74,4 @@ reboot()
                int     opt;
        };
 
                int     opt;
        };
 

-       if (suser())
-               boot(((struct a *)u.u_ap)->opt);

 }
 }