From owner-p4-projects Sun Sep 29 17:13:27 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8B26E37B404; Sun, 29 Sep 2002 17:13:23 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1BC2737B401 for ; Sun, 29 Sep 2002 17:13:23 -0700 (PDT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id B876F43E65 for ; Sun, 29 Sep 2002 17:13:22 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.6/8.12.6) with ESMTP id g8U0DMCo038391 for ; Sun, 29 Sep 2002 17:13:22 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.6/8.12.6/Submit) id g8U0DM7K038388 for perforce@freebsd.org; Sun, 29 Sep 2002 17:13:22 -0700 (PDT) Date: Sun, 29 Sep 2002 17:13:22 -0700 (PDT) Message-Id: <200209300013.g8U0DM7K038388@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 18346 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=18346 Change 18346 by rwatson@rwatson_tislabs on 2002/09/29 17:12:52 Rename the system call mac_get_pid() to __mac_get_pid() to be more consistent with other MAC system calls, and add a libc wrapper. Affected files ... .. //depot/projects/trustedbsd/mac/lib/libc/posix1e/mac_get.c#8 edit .. //depot/projects/trustedbsd/mac/sys/kern/init_sysent.c#30 edit .. //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#280 edit .. //depot/projects/trustedbsd/mac/sys/kern/syscalls.c#30 edit .. //depot/projects/trustedbsd/mac/sys/kern/syscalls.master#26 edit .. //depot/projects/trustedbsd/mac/sys/sys/syscall.h#30 edit .. //depot/projects/trustedbsd/mac/sys/sys/syscall.mk#30 edit .. //depot/projects/trustedbsd/mac/sys/sys/sysproto.h#31 edit Differences ... ==== //depot/projects/trustedbsd/mac/lib/libc/posix1e/mac_get.c#8 (text+ko) ==== @@ -52,19 +52,15 @@ } int -mac_get_proc(struct mac *label) +mac_get_pid(pid_t pid, struct mac *label) { - return (__mac_get_proc(label)); + return (__mac_get_pid(pid, label)); } -/* - * XXXMAC: Not yet. - int -mac_get_pid(pid_t pid, struct mac *label) +mac_get_proc(struct mac *label) { - return (__mac_get_pid(pid, label)); + return (__mac_get_proc(label)); } -*/ ==== //depot/projects/trustedbsd/mac/sys/kern/init_sysent.c#30 (text+ko) ==== @@ -423,6 +423,6 @@ { AS(uuidgen_args), (sy_call_t *)uuidgen }, /* 392 = uuidgen */ { SYF_MPSAFE | AS(sendfile_args), (sy_call_t *)sendfile }, /* 393 = sendfile */ { SYF_MPSAFE | AS(mac_syscall_args), (sy_call_t *)mac_syscall }, /* 394 = mac_syscall */ - { SYF_MPSAFE | AS(mac_get_pid_args), (sy_call_t *)mac_get_pid }, /* 395 = mac_get_pid */ + { SYF_MPSAFE | AS(__mac_get_pid_args), (sy_call_t *)__mac_get_pid }, /* 395 = __mac_get_pid */ { SYF_MPSAFE | AS(macctl_args), (sy_call_t *)macctl }, /* 396 = macctl */ }; ==== //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#280 (text+ko) ==== @@ -3617,7 +3617,7 @@ } int -mac_get_pid(struct thread *td, struct mac_get_pid_args *uap) +__mac_get_pid(struct thread *td, struct __mac_get_pid_args *uap) { struct mac_element *element_array; struct mac mac; @@ -4176,7 +4176,7 @@ #else /* !MAC */ int -mac_get_pid(struct thread *td, struct mac_get_pid_args *uap) +__mac_get_pid(struct thread *td, struct __mac_get_pid_args *uap) { return (ENOSYS); ==== //depot/projects/trustedbsd/mac/sys/kern/syscalls.c#30 (text+ko) ==== @@ -402,6 +402,6 @@ "uuidgen", /* 392 = uuidgen */ "sendfile", /* 393 = sendfile */ "mac_syscall", /* 394 = mac_syscall */ - "mac_get_pid", /* 395 = mac_get_pid */ + "__mac_get_pid", /* 395 = __mac_get_pid */ "macctl", /* 396 = macctl */ }; ==== //depot/projects/trustedbsd/mac/sys/kern/syscalls.master#26 (text+ko) ==== @@ -569,6 +569,6 @@ struct sf_hdtr *hdtr, off_t *sbytes, int flags); } 394 MSTD BSD { int mac_syscall(const char *policy, int call, \ void *arg); } -395 MSTD BSD { int mac_get_pid(pid_t pid, struct mac *mac_p); } +395 MSTD BSD { int __mac_get_pid(pid_t pid, struct mac *mac_p); } 396 MSTD BSD { int macctl(char *policy, u_int op, void *arg, \ u_int arglen, void *ret, u_int *retlen); } ==== //depot/projects/trustedbsd/mac/sys/sys/syscall.h#30 (text+ko) ==== @@ -308,6 +308,6 @@ #define SYS_uuidgen 392 #define SYS_sendfile 393 #define SYS_mac_syscall 394 -#define SYS_mac_get_pid 395 +#define SYS___mac_get_pid 395 #define SYS_macctl 396 #define SYS_MAXSYSCALL 397 ==== //depot/projects/trustedbsd/mac/sys/sys/syscall.mk#30 (text+ko) ==== @@ -257,5 +257,5 @@ uuidgen.o \ sendfile.o \ mac_syscall.o \ - mac_get_pid.o \ + __mac_get_pid.o \ macctl.o ==== //depot/projects/trustedbsd/mac/sys/sys/sysproto.h#31 (text+ko) ==== @@ -1125,7 +1125,7 @@ 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_pid_args { +struct __mac_get_pid_args { char pid_l_[PADL_(pid_t)]; pid_t pid; char pid_r_[PADR_(pid_t)]; char mac_p_l_[PADL_(struct mac *)]; struct mac * mac_p; char mac_p_r_[PADR_(struct mac *)]; }; @@ -1390,7 +1390,7 @@ 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_pid(struct thread *, struct mac_get_pid_args *); +int __mac_get_pid(struct thread *, struct __mac_get_pid_args *); int macctl(struct thread *, struct macctl_args *); #ifdef COMPAT_43 To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message