PERFORCE change 77936 for review

[Andrew Reisse]

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

Change 77936 by areisse at areisse_ibook on 2005/06/03 18:36:36

	copyinstr wants a size on darwin.
	Fix a couple of build/warning issues related to the new selinux
	pieces.

Affected files ...

.. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/flask/security_classes#3 edit
.. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/sebsd.h#3 edit
.. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/sebsd_syscall.c#4 edit
.. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/sebsd_syscalls.h#3 edit
.. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/ss/mach_av.c#2 edit

Differences ...

==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/flask/security_classes#3 (text+ko) ====

@@ -42,11 +42,6 @@
 
 class mach_port
 
-class port_methods1
-class port_methods2
-class port_methods3
-class port_methods4
-
 #classes only used by name
 
 class mach_task

==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/sebsd.h#3 (text+ko) ====

@@ -40,6 +40,7 @@
 #include <sedarwin/flask_types.h>
 
 #define SELINUX_MAGIC 0xf97cff8c
+#define SEBSD_ID_STRING			"sebsd"
 #define	SEBSD_MAC_EXTATTR_NAME		"sebsd"
 #define	SEBSD_MAC_EXTATTR_NAMESPACE	EXTATTR_NAMESPACE_SYSTEM
 

==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/sebsd_syscall.c#4 (text+ko) ====

@@ -209,7 +209,7 @@
 };
 
 static int
-sebsd_get_bools(struct thread *td, struct sebsd_get_bools *gb)
+sebsd_get_bools(struct proc *td, struct sebsd_get_bools *gb)
 {
 	char *out = NULL;
 	if (gb->out)
@@ -314,7 +314,8 @@
 	{
 		char str[128];
 		int  active, pending;
-		err = copyinstr(args,str, 128, NULL);
+		size_t dummy;
+		err = copyinstr(args,str, 128, &dummy);
 		if (err)
 			return (err);
 		security_get_bool(str, &active, &pending);

==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/sebsd_syscalls.h#3 (text+ko) ====

@@ -1,6 +1,8 @@
 #ifndef _SEBSD_SYSCALLS_H_
 #define _SEBSD_SYSCALLS_H_
 
+#include <sedarwin/linux-compat.h>
+
 /*
  * TBD: Should we really try to line up with SELinux?
  */

==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/ss/mach_av.c#2 (text+ko) ====

To Unsubscribe: send mail to majordomo at trustedbsd.org
with "unsubscribe trustedbsd-cvs" in the body of the message