PERFORCE change 40048 for review

[Hrishikesh Dandekar]

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

Change 40048 by hdandeka at hdandeka_yash on 2003/10/20 17:08:47

	Fix related to resolving undefined references to __mac_get_fs.
	Stub for __mac_get_fs when MAC not enabled.

Affected files ...

.. //depot/projects/trustedbsd/sebsd/sys/kern/kern_mac.c#13 edit
.. //depot/projects/trustedbsd/sebsd/sys/kern/syscalls.c#5 edit
.. //depot/projects/trustedbsd/sebsd/sys/sys/syscall.h#5 edit
.. //depot/projects/trustedbsd/sebsd/sys/sys/syscall.mk#5 edit
.. //depot/projects/trustedbsd/sebsd/sys/sys/sysproto.h#5 edit

Differences ...

==== //depot/projects/trustedbsd/sebsd/sys/kern/kern_mac.c#13 (text+ko) ====

@@ -4841,6 +4841,13 @@
 }
 
 int
+__mac_get_fs(struct thread *td, struct __mac_get_fs_args *uap)
+{
+
+	return (ENOSYS);
+}
+	
+int
 __mac_set_fd(struct thread *td, struct __mac_set_fd_args *uap)
 {
 

==== //depot/projects/trustedbsd/sebsd/sys/kern/syscalls.c#5 (text+ko) ====

@@ -2,8 +2,8 @@
  * System call names.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * $FreeBSD: src/sys/kern/syscalls.c,v 1.141 2003/07/17 22:45:33 davidxu Exp $
- * created from FreeBSD: src/sys/kern/syscalls.master,v 1.151 2003/06/28 08:29:05 davidxu Exp 
+ * $FreeBSD$
+ * created from FreeBSD: src/sys/kern/syscalls.master,v 1.152 2003/07/17 22:45:33 davidxu Exp 
  */
 
 const char *syscallnames[] = {
@@ -402,8 +402,8 @@
 	"uuidgen",			/* 392 = uuidgen */
 	"sendfile",			/* 393 = sendfile */
 	"mac_syscall",			/* 394 = mac_syscall */
-	"#395",			/* 395 = nosys */
-	"#396",			/* 396 = nosys */
+	"__mac_get_fs",			/* 395 = __mac_get_fs */
+	"lmount",			/* 396 = lmount */
 	"#397",			/* 397 = nosys */
 	"#398",			/* 398 = nosys */
 	"#399",			/* 399 = nosys */

==== //depot/projects/trustedbsd/sebsd/sys/sys/syscall.h#5 (text+ko) ====

@@ -2,8 +2,8 @@
  * System call numbers.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * $FreeBSD: src/sys/sys/syscall.h,v 1.139 2003/07/17 22:45:33 davidxu Exp $
- * created from FreeBSD: src/sys/kern/syscalls.master,v 1.151 2003/06/28 08:29:05 davidxu Exp 
+ * $FreeBSD$
+ * created from FreeBSD: src/sys/kern/syscalls.master,v 1.152 2003/07/17 22:45:33 davidxu Exp 
  */
 
 #define	SYS_syscall	0
@@ -310,6 +310,8 @@
 #define	SYS_uuidgen	392
 #define	SYS_sendfile	393
 #define	SYS_mac_syscall	394
+#define	SYS___mac_get_fs	395
+#define	SYS_lmount	396
 #define	SYS_ksem_close	400
 #define	SYS_ksem_post	401
 #define	SYS_ksem_wait	402

==== //depot/projects/trustedbsd/sebsd/sys/sys/syscall.mk#5 (text+ko) ====

@@ -1,7 +1,7 @@
 # FreeBSD system call names.
 # DO NOT EDIT-- this file is automatically generated.
-# $FreeBSD: src/sys/sys/syscall.mk,v 1.94 2003/07/17 22:45:33 davidxu Exp $
-# created from FreeBSD: src/sys/kern/syscalls.master,v 1.151 2003/06/28 08:29:05 davidxu Exp 
+# $FreeBSD$
+# created from FreeBSD: src/sys/kern/syscalls.master,v 1.152 2003/07/17 22:45:33 davidxu Exp 
 MIASM =  \
 	syscall.o \
 	exit.o \
@@ -256,6 +256,8 @@
 	uuidgen.o \
 	sendfile.o \
 	mac_syscall.o \
+	__mac_get_fs.o \
+	lmount.o \
 	ksem_close.o \
 	ksem_post.o \
 	ksem_wait.o \

==== //depot/projects/trustedbsd/sebsd/sys/sys/sysproto.h#5 (text+ko) ====

@@ -2,8 +2,8 @@
  * System call prototypes.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * $FreeBSD: src/sys/sys/sysproto.h,v 1.135 2003/07/17 22:45:33 davidxu Exp $
- * created from FreeBSD: src/sys/kern/syscalls.master,v 1.151 2003/06/28 08:29:05 davidxu Exp 
+ * $FreeBSD$
+ * created from FreeBSD: src/sys/kern/syscalls.master,v 1.152 2003/07/17 22:45:33 davidxu Exp 
  */
 
 #ifndef _SYS_SYSPROTO_H_
@@ -980,7 +980,6 @@
 	char filename_l_[PADL_(const char *)]; const char * filename; char filename_r_[PADR_(const char *)];
 	char attrnamespace_l_[PADL_(int)]; int attrnamespace; char attrnamespace_r_[PADR_(int)];
 	char attrname_l_[PADL_(const char *)]; const char * attrname; char attrname_r_[PADR_(const char *)];
-	char extended_l_[PADL_(void *)]; void * extended; char extended_r_[PADR_(void *)];
 };
 struct extattr_set_file_args {
 	char path_l_[PADL_(const char *)]; const char * path; char path_r_[PADR_(const char *)];
@@ -1129,6 +1128,17 @@
 	char call_l_[PADL_(int)]; int call; char call_r_[PADR_(int)];
 	char arg_l_[PADL_(void *)]; void * arg; char arg_r_[PADR_(void *)];
 };
+struct __mac_get_fs_args {
+	char path_p_l_[PADL_(const char *)]; const char * path_p; char path_p_r_[PADR_(const char *)];
+	char mac_p_l_[PADL_(struct mac *)]; struct mac * mac_p; char mac_p_r_[PADR_(struct mac *)];
+};
+struct lmount_args {
+	char type_l_[PADL_(char *)]; char * type; char type_r_[PADR_(char *)];
+	char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)];
+	char flags_l_[PADL_(int)]; int flags; char flags_r_[PADR_(int)];
+	char data_l_[PADL_(caddr_t)]; caddr_t data; char data_r_[PADR_(caddr_t)];
+	char mac_p_l_[PADL_(struct mac *)]; struct mac * mac_p; char mac_p_r_[PADR_(struct mac *)];
+};
 struct ksem_close_args {
 	char id_l_[PADL_(semid_t)]; semid_t id; char id_r_[PADR_(semid_t)];
 };
@@ -1537,6 +1547,8 @@
 int	uuidgen(struct thread *, struct uuidgen_args *);
 int	sendfile(struct thread *, struct sendfile_args *);
 int	mac_syscall(struct thread *, struct mac_syscall_args *);
+int	__mac_get_fs(struct thread *, struct __mac_get_fs_args *);
+int	lmount(struct thread *, struct lmount_args *);
 int	ksem_close(struct thread *, struct ksem_close_args *);
 int	ksem_post(struct thread *, struct ksem_post_args *);
 int	ksem_wait(struct thread *, struct ksem_wait_args *);
To Unsubscribe: send mail to majordomo at trustedbsd.org
with "unsubscribe trustedbsd-cvs" in the body of the message