PERFORCE change 133743 for review

[Robert Watson]

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

Change 133743 by rwatson at rwatson_freebsd_capabilities on 2008/01/20 21:32:02

	Regenerate.

Affected files ...

.. //depot/projects/trustedbsd/capabilities/src/sys/kern/init_sysent.c#2 edit
.. //depot/projects/trustedbsd/capabilities/src/sys/kern/syscalls.c#2 edit
.. //depot/projects/trustedbsd/capabilities/src/sys/kern/systrace_args.c#2 edit
.. //depot/projects/trustedbsd/capabilities/src/sys/sys/syscall.h#2 edit
.. //depot/projects/trustedbsd/capabilities/src/sys/sys/syscall.mk#2 edit
.. //depot/projects/trustedbsd/capabilities/src/sys/sys/sysproto.h#2 edit

Differences ...

==== //depot/projects/trustedbsd/capabilities/src/sys/kern/init_sysent.c#2 (text+ko) ====

@@ -2,7 +2,7 @@
  * System call switch table.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * $FreeBSD: src/sys/kern/init_sysent.c,v 1.231 2008/01/08 22:01:25 jhb Exp $
+ * $FreeBSD$
  * created from FreeBSD: src/sys/kern/syscalls.master,v 1.235 2008/01/08 21:58:15 jhb Exp 
  */
 
@@ -513,4 +513,6 @@
 	{ AS(thr_kill2_args), (sy_call_t *)thr_kill2, AUE_KILL, NULL, 0, 0 },	/* 481 = thr_kill2 */
 	{ AS(shm_open_args), (sy_call_t *)shm_open, AUE_NULL, NULL, 0, 0 },	/* 482 = shm_open */
 	{ AS(shm_unlink_args), (sy_call_t *)shm_unlink, AUE_NULL, NULL, 0, 0 },	/* 483 = shm_unlink */
+	{ AS(cap_new_args), (sy_call_t *)cap_new, AUE_NULL, NULL, 0, 0 },	/* 484 = cap_new */
+	{ AS(cap_getrights_args), (sy_call_t *)cap_getrights, AUE_NULL, NULL, 0, 0 },	/* 485 = cap_getrights */
 };

==== //depot/projects/trustedbsd/capabilities/src/sys/kern/syscalls.c#2 (text+ko) ====

@@ -2,7 +2,7 @@
  * System call names.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * $FreeBSD: src/sys/kern/syscalls.c,v 1.215 2008/01/08 22:01:26 jhb Exp $
+ * $FreeBSD$
  * created from FreeBSD: src/sys/kern/syscalls.master,v 1.235 2008/01/08 21:58:15 jhb Exp 
  */
 
@@ -491,4 +491,6 @@
 	"thr_kill2",			/* 481 = thr_kill2 */
 	"shm_open",			/* 482 = shm_open */
 	"shm_unlink",			/* 483 = shm_unlink */
+	"cap_new",			/* 484 = cap_new */
+	"cap_getrights",			/* 485 = cap_getrights */
 };

==== //depot/projects/trustedbsd/capabilities/src/sys/kern/systrace_args.c#2 (text+ko) ====

@@ -2,7 +2,7 @@
  * System call argument to DTrace register array converstion.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * $FreeBSD: src/sys/kern/systrace_args.c,v 1.15 2008/01/08 22:01:26 jhb Exp $
+ * $FreeBSD$
  * This file is part of the DTrace syscall provider.
  */
 
@@ -2887,6 +2887,22 @@
 		*n_args = 1;
 		break;
 	}
+	/* cap_new */
+	case 484: {
+		struct cap_new_args *p = params;
+		iarg[0] = p->fd; /* int */
+		uarg[1] = p->rights; /* u_int64_t */
+		*n_args = 2;
+		break;
+	}
+	/* cap_getrights */
+	case 485: {
+		struct cap_getrights_args *p = params;
+		iarg[0] = p->fd; /* int */
+		uarg[1] = (intptr_t) p->rightsp; /* u_int64_t * */
+		*n_args = 2;
+		break;
+	}
 	default:
 		*n_args = 0;
 		break;

==== //depot/projects/trustedbsd/capabilities/src/sys/sys/syscall.h#2 (text+ko) ====

@@ -2,7 +2,7 @@
  * System call numbers.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * $FreeBSD: src/sys/sys/syscall.h,v 1.212 2008/01/08 22:01:26 jhb Exp $
+ * $FreeBSD$
  * created from FreeBSD: src/sys/kern/syscalls.master,v 1.235 2008/01/08 21:58:15 jhb Exp 
  */
 
@@ -403,4 +403,6 @@
 #define	SYS_thr_kill2	481
 #define	SYS_shm_open	482
 #define	SYS_shm_unlink	483
-#define	SYS_MAXSYSCALL	484
+#define	SYS_cap_new	484
+#define	SYS_cap_getrights	485
+#define	SYS_MAXSYSCALL	486

==== //depot/projects/trustedbsd/capabilities/src/sys/sys/syscall.mk#2 (text+ko) ====

@@ -1,6 +1,6 @@
 # FreeBSD system call names.
 # DO NOT EDIT-- this file is automatically generated.
-# $FreeBSD: src/sys/sys/syscall.mk,v 1.167 2008/01/08 22:01:26 jhb Exp $
+# $FreeBSD$
 # created from FreeBSD: src/sys/kern/syscalls.master,v 1.235 2008/01/08 21:58:15 jhb Exp 
 MIASM =  \
 	syscall.o \
@@ -351,4 +351,6 @@
 	ftruncate.o \
 	thr_kill2.o \
 	shm_open.o \
-	shm_unlink.o
+	shm_unlink.o \
+	cap_new.o \
+	cap_getrights.o

==== //depot/projects/trustedbsd/capabilities/src/sys/sys/sysproto.h#2 (text+ko) ====

@@ -2,7 +2,7 @@
  * System call prototypes.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * $FreeBSD: src/sys/sys/sysproto.h,v 1.216 2008/01/08 22:01:26 jhb Exp $
+ * $FreeBSD$
  * created from FreeBSD: src/sys/kern/syscalls.master,v 1.235 2008/01/08 21:58:15 jhb Exp 
  */
 
@@ -1528,6 +1528,14 @@
 struct shm_unlink_args {
 	char path_l_[PADL_(const char *)]; const char * path; char path_r_[PADR_(const char *)];
 };
+struct cap_new_args {
+	char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)];
+	char rights_l_[PADL_(u_int64_t)]; u_int64_t rights; char rights_r_[PADR_(u_int64_t)];
+};
+struct cap_getrights_args {
+	char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)];
+	char rightsp_l_[PADL_(u_int64_t *)]; u_int64_t * rightsp; char rightsp_r_[PADR_(u_int64_t *)];
+};
 int	nosys(struct thread *, struct nosys_args *);
 void	sys_exit(struct thread *, struct sys_exit_args *);
 int	fork(struct thread *, struct fork_args *);
@@ -1869,6 +1877,8 @@
 int	thr_kill2(struct thread *, struct thr_kill2_args *);
 int	shm_open(struct thread *, struct shm_open_args *);
 int	shm_unlink(struct thread *, struct shm_unlink_args *);
+int	cap_new(struct thread *, struct cap_new_args *);
+int	cap_getrights(struct thread *, struct cap_getrights_args *);
 
 #ifdef COMPAT_43
 
@@ -2435,6 +2445,8 @@
 #define	SYS_AUE_thr_kill2	AUE_KILL
 #define	SYS_AUE_shm_open	AUE_NULL
 #define	SYS_AUE_shm_unlink	AUE_NULL
+#define	SYS_AUE_cap_new	AUE_NULL
+#define	SYS_AUE_cap_getrights	AUE_NULL
 
 #undef PAD_
 #undef PADL_