From owner-p4-projects@FreeBSD.ORG Sat Jan 10 21:20:47 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3958E16A4D1; Sat, 10 Jan 2004 21:20:47 -0800 (PST) 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 14A8616A4CE for ; Sat, 10 Jan 2004 21:20:47 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9F42C43D4C for ; Sat, 10 Jan 2004 21:20:45 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i0B5Kj0B062926 for ; Sat, 10 Jan 2004 21:20:45 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i0B5Kj8K062923 for perforce@freebsd.org; Sat, 10 Jan 2004 21:20:45 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 10 Jan 2004 21:20:45 -0800 (PST) Message-Id: <200401110520.i0B5Kj8K062923@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Subject: PERFORCE change 45107 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 11 Jan 2004 05:20:47 -0000 http://perforce.freebsd.org/chv.cgi?CH=45107 Change 45107 by rwatson@rwatson_paprika on 2004/01/10 21:19:46 Get bsm_klib.c to almost entirely build: - Fix many includes. - Use udev_t rather than dev_t, since dev_t in the FreeBSD kernel is "special". This might require revisiting. - Comment out vn_getpath(), we don't have one of those yet. - Function prototypes for msgctl_to_event() and semctl_to_event() since they're declared in one place and used in another. - More forward structure definitions. Affected files ... .. //depot/projects/trustedbsd/audit2/sys/security/audit/bsm_klib.c#5 edit .. //depot/projects/trustedbsd/audit2/sys/security/audit/bsm_klib.h#3 edit .. //depot/projects/trustedbsd/audit2/sys/security/audit/kern_audit.h#3 edit Differences ... ==== //depot/projects/trustedbsd/audit2/sys/security/audit/bsm_klib.c#5 (text+ko) ==== @@ -26,6 +26,15 @@ #include #include #include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include @@ -740,7 +749,10 @@ } if (vnp != NULL) { len = MAXPATHLEN; +#error DARWIN_FOO +#ifdef DARWIN_FOO vn_getpath(vnp, cpath, &len); +#endif /* The length returned by vn_getpath() is two greater than the * number of characters in the string. */ ==== //depot/projects/trustedbsd/audit2/sys/security/audit/bsm_klib.h#3 (text+ko) ==== @@ -30,17 +30,19 @@ #define AU_PRS_FAILURE 2 #define AU_PRS_BOTH (AU_PRS_SUCCESS|AU_PRS_FAILURE) -#ifdef _KERNEL +struct vattr; int au_preselect(au_event_t event, au_mask_t *mask_p, int sorf); au_event_t flags_to_openevent(int oflags); void fill_vattr(struct vattr *v, struct vnode_au_info *vn_info); void canon_path(struct proc *p, char *path, char *cpath); + +int msgctl_to_event(int cmd); +int semctl_to_event(int cmd); + /* * Define a system call to audit event mapping table. */ extern au_event_t sys_au_event[]; extern int nsys_au_event; /* number of entries in this table */ -#endif /*_KERNEL*/ - #endif /* ! _BSM_KLIB_H_ */ ==== //depot/projects/trustedbsd/audit2/sys/security/audit/kern_audit.h#3 (text+ko) ==== @@ -89,7 +89,7 @@ mode_t vn_mode; uid_t vn_uid; gid_t vn_gid; - dev_t vn_dev; + udev_t vn_dev; long vn_fsid; long vn_fileid; long vn_gen; @@ -106,6 +106,9 @@ int soprotocol; }; +struct xucred; +struct sockaddr; +struct ipc_perm; struct audit_record { /* Audit record header. */ u_int32_t ar_magic;