xnu-517.9.4.tar.gz

[apple/xnu.git] / bsd / kern / kern_xxx.c

diff --git a/bsd/kern/kern_xxx.c b/bsd/kern/kern_xxx.c
index 49d35c1571330ba284ac1bd183d1b447be9b82a0..ebc0af4469ee06fb93ce8aa3d4765528e2982503 100644 (file)
--- a/bsd/kern/kern_xxx.c
+++ b/bsd/kern/kern_xxx.c
@@ -1,24 +1,21 @@
 /*
- * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2004 Apple Computer, Inc. All rights reserved.
  *
  * @APPLE_LICENSE_HEADER_START@
  * 
- * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
+ * The contents of this file constitute Original Code as defined in and
+ * are subject to the Apple Public Source License Version 1.1 (the
+ * "License").  You may not use this file except in compliance with the
+ * License.  Please obtain a copy of the License at
+ * http://www.apple.com/publicsource and read it before using this file.
  * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * This Original Code and all software distributed under the License are
+ * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
  * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
+ * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
+ * License for the specific language governing rights and limitations
+ * under the License.
  * 
  * @APPLE_LICENSE_HEADER_END@
  */
@@ -69,6 +66,8 @@
 #include <sys/sysctl.h>
 #include <sys/buf.h>
 
+#include <bsm/audit_kernel.h>
+
 #include <sys/mount.h>
 
 #if COMPAT_43
@@ -118,8 +117,7 @@ register_t *retval;
 
        name = KERN_HOSTNAME;
 
-       return (kern_sysctl(&name, 1, uap->hostname, &uap->len),
-           0, 0);
+       return (kern_sysctl(&name, 1, uap->hostname, &uap->len, 0, 0));
 }
 
 struct osethostname_args {
@@ -198,14 +196,15 @@ register_t *retval;
        int error;
        int dummy=0;
 
+       AUDIT_ARG(cmd, uap->opt);
        command[0] = '\0';
 
        if (error = suser(p->p_cred->pc_ucred, &p->p_acflag))
                return(error);  
        
        if (uap->opt & RB_COMMAND)
-               error = copyinstr(uap->command,
-                                       command, sizeof(command), &dummy);
+               error = copyinstr((void *)uap->command,
+                                       (void *)command, sizeof(command), (size_t *)&dummy);
        if (!error) {
                SET(p->p_flag, P_REBOOT);       /* No more signals for this proc */
                boot(RB_BOOT, uap->opt, command);