PERFORCE change 97361 for review

[Todd Miller]

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

Change 97361 by millert at millert_ibook on 2006/05/17 18:46:12

	Remove userland sebsd.h

Affected files ...

.. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/src/getcon.c#4 edit
.. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/src/load_migscs.c#2 edit
.. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/src/load_policy.c#3 edit
.. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/src/sebsd.h#2 delete
.. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/src/setcon.c#2 edit

Differences ...

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

@@ -5,8 +5,6 @@
 #include <stdlib.h>
 #include <errno.h>
 #include "policy.h"
-#include <sedarwin/linux-compat.h>
-#include <sedarwin/sebsd.h>
 #include <sys/mac.h>
 
 int getcon_raw(security_context_t *context)
@@ -16,7 +14,7 @@
         int error;
 	int ret = 0;
 
-        error = mac_prepare(&label, SEBSD_ID_STRING);
+        error = mac_prepare(&label, "sebsd");
 	if (error)
 		return -1;
         error = mac_get_proc(label);

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

@@ -3,7 +3,6 @@
 #include <fcntl.h>
 #include <stdlib.h>
 #include <sedarwin/sebsd_syscalls.h>
-#include <sedarwin/sebsd.h>
 
 int
 selinux_load_migscs(const char *path)
@@ -23,5 +22,5 @@
         if (fread(la.data, la.len, 1, fp) != 1)
                 return (EIO);
 
-        return (mac_syscall(SEBSD_ID_STRING, SEBSDCALL_LOAD_MIGSCS, &la));
+        return (mac_syscall("sebsd", SEBSDCALL_LOAD_MIGSCS, &la));
 }

==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/src/load_policy.c#3 (text+ko) ====

@@ -16,8 +16,6 @@
 #include <sepol/policydb.h>
 #include "policy.h"
 #include <limits.h>
-#include <sedarwin/linux-compat.h>
-#include <sedarwin/sebsd.h>
 #include <sedarwin/sebsd_syscalls.h>
 
 int security_load_policy(void *data, size_t len)
@@ -26,7 +24,7 @@
 
         la.len = len;
         la.data = data;
-        return mac_syscall(SEBSD_ID_STRING, SEBSDCALL_LOAD_POLICY, &la);
+        return mac_syscall("sebsd", SEBSDCALL_LOAD_POLICY, &la);
 }
 hidden_def(security_load_policy)
 

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

@@ -7,15 +7,13 @@
 #include <string.h>
 #include "selinux_internal.h"
 #include <sys/mac.h>
-#include <sedarwin/linux-compat.h>
-#include <sedarwin/sebsd.h>
 
 int setcon_raw(security_context_t context)
 {
 	mac_t label;
 	int error;
 	
-	error = mac_prepare(&label, SEBSD_ID_STRING);
+	error = mac_prepare(&label, "sebsd");
 	if (error)
 		return -1;
 	error = mac_from_text(&label, context);