Date: Mon, 4 Nov 2002 11:51:02 -0800 (PST) From: Robert Watson <rwatson@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 20659 for review Message-ID: <200211041951.gA4Jp2qC026001@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=20659 Change 20659 by rwatson@rwatson_tislabs on 2002/11/04 11:50:32 Complete the rename of __execve_mac() to __mac_execve() requested by many for the main tree. Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/init_sysent.c#44 edit .. //depot/projects/trustedbsd/mac/sys/kern/kern_exec.c#42 edit .. //depot/projects/trustedbsd/mac/sys/kern/syscalls.c#44 edit .. //depot/projects/trustedbsd/mac/sys/kern/syscalls.master#41 edit .. //depot/projects/trustedbsd/mac/sys/sys/mac.h#209 edit .. //depot/projects/trustedbsd/mac/sys/sys/syscall.h#44 edit .. //depot/projects/trustedbsd/mac/sys/sys/syscall.mk#43 edit .. //depot/projects/trustedbsd/mac/sys/sys/sysproto.h#45 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/init_sysent.c#44 (text+ko) ==== @@ -443,7 +443,7 @@ { AS(extattr_set_link_args), (sy_call_t *)extattr_set_link }, /* 412 = extattr_set_link */ { AS(extattr_get_link_args), (sy_call_t *)extattr_get_link }, /* 413 = extattr_get_link */ { AS(extattr_delete_link_args), (sy_call_t *)extattr_delete_link }, /* 414 = extattr_delete_link */ - { SYF_MPSAFE | AS(__execve_mac_args), (sy_call_t *)__execve_mac }, /* 415 = __execve_mac */ + { SYF_MPSAFE | AS(__mac_execve_args), (sy_call_t *)__mac_execve }, /* 415 = __mac_execve */ { SYF_MPSAFE | AS(sigaction_args), (sy_call_t *)sigaction }, /* 416 = sigaction */ { SYF_MPSAFE | AS(sigreturn_args), (sy_call_t *)sigreturn }, /* 417 = sigreturn */ { 0, (sy_call_t *)nosys }, /* 418 = __xstat */ ==== //depot/projects/trustedbsd/mac/sys/kern/kern_exec.c#42 (text+ko) ==== @@ -704,9 +704,9 @@ * MPSAFE */ int -__execve_mac(td, uap) +__mac_execve(td, uap) struct thread *td; - struct __execve_mac_args /* { + struct __mac_execve_args /* { syscallarg(char *) fname; syscallarg(char **) argv; syscallarg(char **) envv; ==== //depot/projects/trustedbsd/mac/sys/kern/syscalls.c#44 (text+ko) ==== @@ -422,7 +422,7 @@ "extattr_set_link", /* 412 = extattr_set_link */ "extattr_get_link", /* 413 = extattr_get_link */ "extattr_delete_link", /* 414 = extattr_delete_link */ - "__execve_mac", /* 415 = __execve_mac */ + "__mac_execve", /* 415 = __mac_execve */ "sigaction", /* 416 = sigaction */ "sigreturn", /* 417 = sigreturn */ "#418", /* 418 = __xstat */ ==== //depot/projects/trustedbsd/mac/sys/kern/syscalls.master#41 (text+ko) ==== @@ -601,7 +601,7 @@ void *data, size_t nbytes); } 414 STD BSD { int extattr_delete_link(const char *path, \ int attrnamespace, const char *attrname); } -415 MSTD BSD { int __execve_mac(char *fname, char **argv, \ +415 MSTD BSD { int __mac_execve(char *fname, char **argv, \ char **envv, struct mac *mac_p); } 416 MSTD POSIX { int sigaction(int sig, const struct sigaction *act, \ struct sigaction *oact); } ==== //depot/projects/trustedbsd/mac/sys/sys/mac.h#209 (text+ko) ==== @@ -84,7 +84,7 @@ * Extended non-POSIX.1e interfaces that offer additional services * available from the userland and kernel MAC frameworks. */ -int execve_mac(char *fname, char **argv, char **envv, +int mac_execve(char *fname, char **argv, char **envv, mac_t _label); int mac_free(mac_t _label); int mac_from_text(mac_t *_label, const char *_text); ==== //depot/projects/trustedbsd/mac/sys/sys/syscall.h#44 (text+ko) ==== @@ -323,7 +323,7 @@ #define SYS_extattr_set_link 412 #define SYS_extattr_get_link 413 #define SYS_extattr_delete_link 414 -#define SYS___execve_mac 415 +#define SYS___mac_execve 415 #define SYS_sigaction 416 #define SYS_sigreturn 417 #define SYS_MAXSYSCALL 421 ==== //depot/projects/trustedbsd/mac/sys/sys/syscall.mk#43 (text+ko) ==== @@ -269,6 +269,6 @@ extattr_set_link.o \ extattr_get_link.o \ extattr_delete_link.o \ - __execve_mac.o \ + __mac_execve.o \ sigaction.o \ sigreturn.o ==== //depot/projects/trustedbsd/mac/sys/sys/sysproto.h#45 (text+ko) ==== @@ -1178,7 +1178,7 @@ 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 *)]; }; -struct __execve_mac_args { +struct __mac_execve_args { char fname_l_[PADL_(char *)]; char * fname; char fname_r_[PADR_(char *)]; char argv_l_[PADL_(char **)]; char ** argv; char argv_r_[PADR_(char **)]; char envv_l_[PADL_(char **)]; char ** envv; char envv_r_[PADR_(char **)]; @@ -1457,7 +1457,7 @@ int extattr_set_link(struct thread *, struct extattr_set_link_args *); int extattr_get_link(struct thread *, struct extattr_get_link_args *); int extattr_delete_link(struct thread *, struct extattr_delete_link_args *); -int __execve_mac(struct thread *, struct __execve_mac_args *); +int __mac_execve(struct thread *, struct __mac_execve_args *); int sigaction(struct thread *, struct sigaction_args *); int sigreturn(struct thread *, struct sigreturn_args *); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200211041951.gA4Jp2qC026001>