svn commit: r276115 - in projects/ino64: contrib/openbsm/libbsm sys/bsm sys/security/audit

[Gleb Kurtsou]

Author: gleb
Date: Tue Dec 23 08:10:20 2014
New Revision: 276115
URL: https://svnweb.freebsd.org/changeset/base/276115

Log:
  audit: Preserve original ABI of audit subsytem.
  
  Keep dev_t 32-bit.
  Add comments for obvious compatibility issue.

Modified:
  projects/ino64/contrib/openbsm/libbsm/bsm_wrappers.c
  projects/ino64/sys/bsm/audit.h
  projects/ino64/sys/security/audit/audit_private.h

Modified: projects/ino64/contrib/openbsm/libbsm/bsm_wrappers.c
==============================================================================
--- projects/ino64/contrib/openbsm/libbsm/bsm_wrappers.c	Tue Dec 23 08:10:16 2014	(r276114)
+++ projects/ino64/contrib/openbsm/libbsm/bsm_wrappers.c	Tue Dec 23 08:10:20 2014	(r276115)
@@ -260,12 +260,14 @@ audit_set_terminal_host(uint32_t *m)
 int
 audit_set_terminal_id(au_tid_t *tid)
 {
+	dev_t port;
 	int ret;
 
 	if (tid == NULL)
 		return (kAUBadParamErr);
-	if ((ret = audit_set_terminal_port(&tid->port)) != kAUNoErr)
+	if ((ret = audit_set_terminal_port(&port)) != kAUNoErr)
 		return (ret);
+	tid->port = port;
 	return (audit_set_terminal_host(&tid->machine));
 }
 

Modified: projects/ino64/sys/bsm/audit.h
==============================================================================
--- projects/ino64/sys/bsm/audit.h	Tue Dec 23 08:10:16 2014	(r276114)
+++ projects/ino64/sys/bsm/audit.h	Tue Dec 23 08:10:20 2014	(r276115)
@@ -176,13 +176,13 @@ typedef	u_int32_t	au_class_t;
 typedef	u_int64_t	au_asflgs_t __attribute__ ((aligned (8)));
 
 struct au_tid {
-	dev_t		port;
+	u_int32_t	port;		/* XXX dev_t compatibility */
 	u_int32_t	machine;
 };
 typedef	struct au_tid	au_tid_t;
 
 struct au_tid_addr {
-	dev_t		at_port;
+	u_int32_t	at_port;	/* XXX dev_t compatibility */
 	u_int32_t	at_type;
 	u_int32_t	at_addr[4];
 };

Modified: projects/ino64/sys/security/audit/audit_private.h
==============================================================================
--- projects/ino64/sys/security/audit/audit_private.h	Tue Dec 23 08:10:16 2014	(r276114)
+++ projects/ino64/sys/security/audit/audit_private.h	Tue Dec 23 08:10:20 2014	(r276115)
@@ -99,9 +99,9 @@ struct vnode_au_info {
 	mode_t	vn_mode;
 	uid_t	vn_uid;
 	gid_t	vn_gid;
-	dev_t	vn_dev;
-	long	vn_fsid;
-	long	vn_fileid;
+	u_int32_t vn_dev;		/* XXX dev_t compatibility */
+	long	vn_fsid;		/* XXX uint64_t compatibility */
+	long	vn_fileid;		/* XXX ino_t compatibility */
 	long	vn_gen;
 };
 
@@ -201,7 +201,7 @@ struct audit_record {
 	int			ar_arg_atfd2;
 	int			ar_arg_fflags;
 	mode_t			ar_arg_mode;
-	int			ar_arg_dev;
+	int			ar_arg_dev;	/* XXX dev_t compatibility */
 	long			ar_arg_value;
 	void			*ar_arg_addr;
 	int			ar_arg_len;