PERFORCE change 76417 for review
Robert Watson
rwatson at FreeBSD.org
Tue May 3 10:58:55 GMT 2005
http://perforce.freebsd.org/chv.cgi?CH=76417
Change 76417 by rwatson at rwatson_paprika on 2005/05/03 10:58:55
Move from AU_.*_TOKEN to AUT_.*, with minor tweaks, to match the
constant names used by Solaris; provide compatibility defines for
Darwin's BSM that we will remove at some point in the future. This
will allow token handling code written to Sun's API to compile with
OpenBSM more easily. Most tools don't use the token defines, since
that is only needed for direct frobbing of the binary audit stream,
so this relatively non-disruptive for everything but libbsm itself.
Internal function names are not yet renamed to match the new token
names.
Document a couple of cases where a #define was present in Darwin
that is not easily google-able.
Affected files ...
.. //depot/projects/trustedbsd/openbsm/bsm/audit_record.h#9 edit
.. //depot/projects/trustedbsd/openbsm/libbsm/bsm_io.c#12 edit
.. //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#13 edit
Differences ...
==== //depot/projects/trustedbsd/openbsm/bsm/audit_record.h#9 (text+ko) ====
@@ -35,116 +35,137 @@
* Values marked as XXX do not have a value defined in the BSM header files
*/
-/*
- * Control token types
-
-#define AUT_OTHER_FILE ((char)0x11)
-#define AUT_OTHER_FILE32 AUT_OTHER_FILE
-#define AUT_OHEADER ((char)0x12)
+#define AUT_INVALID 0x00
+#define AUT_OTHER_FILE32 0x11
+#define AUT_OHEADER 0x12
+#define AUT_TRAILER 0x13
+#define AUT_HEADER32 0x14
+#define AUT_HEADER32_EX 0x15
+#define AUT_DATA 0x21
+#define AUT_IPC 0x22
+#define AUT_PATH 0x23
+#define AUT_SUBJECT32 0x24
+#define AUT_SERVER32 0x25
+#define AUT_PROCESS32 0x26
+#define AUT_RETURN32 0x27
+#define AUT_TEXT 0x28
+#define AUT_OPAQUE 0x29
+#define AUT_IN_ADDR 0x2a
+#define AUT_IP 0x2b
+#define AUT_IPORT 0x2c
+#define AUT_ARG32 0x2d
+#define AUT_SOCKET 0x2e
+#define AUT_SEQ 0x2f
+#define AUT_ACL 0x30
+#define AUT_ATTR 0x31
+#define AUT_IPC_PERM 0x32
+#define AUT_LABEL 0x33
+#define AUT_GROUPS 0x34
+#define AUT_ILABEL 0x35
+#define AUT_SLABEL 0x36
+#define AUT_CLEAR 0x37
+#define AUT_PRIV 0x38
+#define AUT_UPRIV 0x39
+#define AUT_LIAISON 0x3a
+#define AUT_NEWGROUPS 0x3b
+#define AUT_EXEC_ARGS 0x3c
+#define AUT_EXEC_ENV 0x3d
+#define AUT_ATTR32 0x3e
+/* #define AUT_???? 0x3f */
+#define AUT_XATOM 0x40
+#define AUT_XOBJ 0x41
+#define AUT_XPROTO 0x42
+#define AUT_XSELECT 0x43
+/* XXXRW: Additional X11 tokens not defined? */
+#define AUT_CMD 0x51
+#define AUT_EXIT 0x52
+/* XXXRW: OpenBSM AUT_HOST 0x70? */
+#define AUT_ARG64 0x71
+#define AUT_RETURN64 0x72
+#define AUT_ATTR64 0x73
+#define AUT_HEADER64 0x74
+#define AUT_SUBJECT64 0x75
+#define AUT_SERVER64 0x76
+#define AUT_PROCESS64 0x77
+#define AUT_OTHER_FILE64 0x78
+#define AUT_HEADER64_EX 0x79
+#define AUT_SUBJECT32_EX 0x7a
+#define AUT_PROCESS32_EX 0x7b
+#define AUT_SUBJECT64_EX 0x7c
+#define AUT_PROCESS64_EX 0x7d
+#define AUT_IN_ADDR_EX 0x7e
+#define AUT_SOCKET_EX 0x7f
- */
-
-#define AUT_INVALID 0x00
-#define AU_FILE_TOKEN 0x11
-#define AU_TRAILER_TOKEN 0x13
-#define AU_HEADER_32_TOKEN 0x14
-#define AU_HEADER_EX_32_TOKEN 0x15
-
/*
- * Data token types
-#define AUT_SERVER ((char)0x25)
-#define AUT_SERVER32 AUT_SERVER
+ * Pre-64-bit BSM, 32-bit tokens weren't explicitly named as '32'. We have
+ * compatibility defines.
*/
+#define AUT_HEADER AUT_HEADER32
+#define AUT_ARG AUT_ARG32
+#define AUT_RETURN AUT_RETURN32
+#define AUT_SUBJECT AUT_SUBJECT32
+#define AUT_SERVER AUT_SERVER32
+#define AUT_PROCESS AUT_PROCESS32
+#define AUT_OTHER_FILE AUT_OTHER_FILE32
-#define AU_DATA_TOKEN 0x21
-#define AU_ARB_TOKEN AU_DATA_TOKEN
-#define AU_IPC_TOKEN 0x22
-#define AU_PATH_TOKEN 0x23
-#define AU_SUBJECT_32_TOKEN 0x24
-#define AU_PROCESS_32_TOKEN 0x26
-#define AU_RETURN_32_TOKEN 0x27
-#define AU_TEXT_TOKEN 0x28
-#define AU_OPAQUE_TOKEN 0x29
-#define AU_IN_ADDR_TOKEN 0x2A
-#define AU_IP_TOKEN 0x2B
-#define AU_IPORT_TOKEN 0x2C
-#define AU_ARG32_TOKEN 0x2D
-#define AU_SOCK_TOKEN 0x2E
-#define AU_SEQ_TOKEN 0x2F
-
/*
- * Modifier token types
-
-#define AUT_ACL ((char)0x30)
-#define AUT_LABEL ((char)0x33)
-#define AUT_GROUPS ((char)0x34)
-#define AUT_ILABEL ((char)0x35)
-#define AUT_SLABEL ((char)0x36)
-#define AUT_CLEAR ((char)0x37)
-#define AUT_PRIV ((char)0x38)
-#define AUT_UPRIV ((char)0x39)
-#define AUT_LIAISON ((char)0x3A)
-
+ * Darwin's bsm distribution uses the following non-BSM token name defines.
+ * We provide them for a single OpenBSM release for compatibility reasons.
*/
-
-#define AU_ATTR_TOKEN 0x31
-#define AU_IPCPERM_TOKEN 0x32
-#define AU_NEWGROUPS_TOKEN 0x3B
-#define AU_EXEC_ARG_TOKEN 0x3C
-#define AU_EXEC_ENV_TOKEN 0x3D
-#define AU_ATTR32_TOKEN 0x3E
+#define AU_FILE_TOKEN AUT_OTHER_FILE32
+#define AU_TRAILER_TOKEN AUT_TRAILER
+#define AU_HEADER_32_TOKEN AUT_HEADER32
+#define AU_DATA_TOKEN AUT_DATA
+#define AU_ARB_TOKEN AUT_DATA
+#define AU_IPC_TOKEN AUT_IPC
+#define AU_PATH_TOKEN AUT_PATH
+#define AU_SUBJECT_32_TOKEN AUT_SUBJECT32
+#define AU_PROCESS_32_TOKEN AUT_PROCESS32
+#define AU_RETURN_32_TOKEN AUT_RETURN32
+#define AU_TEXT_TOKEN AUT_TEXT
+#define AU_OPAQUE_TOKEN AUT_OPAQUE
+#define AU_IN_ADDR_TOKEN AUT_IN_ADDR
+#define AU_IP_TOKEN AUT_IP
+#define AU_IPORT_TOKEN AUT_IPORT
+#define AU_ARG32_TOKEN AUT_ARG32
+#define AU_SOCK_TOKEN AUT_SOCKET
+#define AU_SEQ_TOKEN AUT_SEQ
+#define AU_ATTR_TOKEN AUT_ATTR
+#define AU_IPCPERM_TOKEN AUT_IPC_PERM
+#define AU_NEWGROUPS_TOKEN AUT_NEWGROUPS
+#define AU_EXEC_ARG_TOKEN AUT_EXEC_ARGS
+#define AU_EXEC_ENV_TOKEN AUT_EXEC_ENV
+#define AU_ATTR32_TOKEN AUT_ATTR32
+#define AU_CMD_TOKEN AUT_CMD
+#define AU_EXIT_TOKEN AUT_EXIT
+#define AU_ARG64_TOKEN AUT_ARG64
+#define AU_RETURN_64_TOKEN AUT_RETURN64
+#define AU_ATTR64_TOKEN AUT_ATTR64
+#define AU_HEADER_64_TOKEN AUT_HEADER64
+#define AU_SUBJECT_64_TOKEN AUT_SUBJECT64
+#define AU_PROCESS_64_TOKEN AUT_PROCESS64
+#define AU_HEADER_64_EX_TOKEN AUT_HEADER64_EX
+#define AU_SUBJECT_32_EX_TOKEN AUT_SUBJECT32_EX
+#define AU_PROCESS_32_EX_TOKEN AUT_PROCESS32_EX
+#define AU_SUBJECT_64_EX_TOKEN AUT_SUBJECT64_EX
+#define AU_PROCESS_64_EX_TOKEN AUT_PROCESS64_EX
+#define AU_IN_ADDR_EX_TOKEN AUT_IN_ADDR_EX
+#define AU_SOCK_32_EX_TOKEN AUT_SOCKET_EX
/*
- * Command token types
+ * The values for the following token ids are not defined by BSM.
+ *
+ * XXXRW: Not sure how to andle these in OpenBSM yet, but I'll give them
+ * names more consistent with Sun's BSM. These originally came from Apple's
+ * BSM.
*/
-
-#define AU_CMD_TOKEN 0x51
-#define AU_EXIT_TOKEN 0x52
-
-/*
- * Miscellaneous token types
-
-#define AUT_HOST ((char)0x70)
-
- */
-
-/*
- * 64bit token types
+#define AUT_SOCKINET32 0x80 /* XXX */
+#define AUT_SOCKINET128 0x81 /* XXX */
+#define AUT_SOCKUNIX 0x82 /* XXX */
+#define AU_SOCK_INET_32_TOKEN AUT_SOCKINET32
+#define AU_SOCK_INET_128_TOKEN AUT_SOCKINET128
+#define AU_SOCK_UNIX_TOKEN AUT_SOCKUNIX
-#define AUT_SERVER64 ((char)0x76)
-#define AUT_OTHER_FILE64 ((char)0x78)
-
- */
-
-#define AU_ARG64_TOKEN 0x71
-#define AU_RETURN_64_TOKEN 0x72
-#define AU_ATTR64_TOKEN 0x73
-#define AU_HEADER_64_TOKEN 0x74
-#define AU_SUBJECT_64_TOKEN 0x75
-#define AU_PROCESS_64_TOKEN 0x77
-
-/*
- * Extended network address token types
- */
-
-#define AU_HEADER_EX_64_TOKEN 0x79
-#define AU_SUBJECT_32_EX_TOKEN 0x7a
-#define AU_PROCESS_32_EX_TOKEN 0x7b
-#define AU_SUBJECT_64_EX_TOKEN 0x7c
-#define AU_PROCESS_64_EX_TOKEN 0x7d
-#define AU_IN_ADDR_EX_TOKEN 0x7e
-#define AU_SOCK_EX32_TOKEN 0x7f
-#define AU_SOCK_EX128_TOKEN AUT_INVALID /*XXX*/
-#define AU_IP_EX_TOKEN AUT_INVALID /*XXX*/
-
-/*
- * The values for the following token ids are not
- * defined by BSM
- */
-#define AU_SOCK_INET_32_TOKEN 0x80 /*XXX*/
-#define AU_SOCK_INET_128_TOKEN 0x81 /*XXX*/
-#define AU_SOCK_UNIX_TOKEN 0x82 /*XXX*/
-
/* print values for the arbitrary token */
#define AUP_BINARY 0
#define AUP_OCTAL 1
@@ -169,7 +190,13 @@
#define BSM_MAX_GROUPS 16
#define HEADER_VERSION 1
-#define TRAILER_PAD_MAGIC 0xB105
+
+/*
+ * BSM define is AUT_TRAILER_MAGIC; Apple BSM define is TRAILER_PAD_MAGIC; we
+ * split the difference, will remove the Apple define for the next release.
+ */
+#define AUT_TRAILER_MAGIC 0xb105
+#define TRAILER_PAD_MAGIC AUT_TRAILER_MAGIC
/* BSM library calls */
==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_io.c#12 (text+ko) ====
@@ -2284,106 +2284,106 @@
switch(tok->id) {
- case AU_HEADER_32_TOKEN :
+ case AUT_HEADER32:
return fetch_header32_tok(tok, buf, len);
- case AU_HEADER_64_TOKEN :
+ case AUT_HEADER64:
return fetch_header64_tok(tok, buf, len);
- case AU_TRAILER_TOKEN :
+ case AUT_TRAILER:
return fetch_trailer_tok(tok, buf, len);
- case AU_ARG32_TOKEN :
+ case AUT_ARG32:
return fetch_arg32_tok(tok, buf, len);
- case AU_ARG64_TOKEN :
+ case AUT_ARG64:
return fetch_arg64_tok(tok, buf, len);
- case AU_ATTR32_TOKEN :
+ case AUT_ATTR32:
return fetch_attr32_tok(tok, buf, len);
- case AU_ATTR64_TOKEN :
+ case AUT_ATTR64:
return fetch_attr64_tok(tok, buf, len);
- case AU_EXIT_TOKEN :
+ case AUT_EXIT:
return fetch_exit_tok(tok, buf, len);
- case AU_EXEC_ARG_TOKEN :
+ case AUT_EXEC_ARGS:
return fetch_execarg_tok(tok, buf, len);
- case AU_EXEC_ENV_TOKEN :
+ case AUT_EXEC_ENV:
return fetch_execenv_tok(tok, buf, len);
- case AU_FILE_TOKEN :
+ case AUT_OTHER_FILE32:
return fetch_file_tok(tok, buf, len);
- case AU_NEWGROUPS_TOKEN :
+ case AUT_NEWGROUPS:
return fetch_newgroups_tok(tok, buf, len);
- case AU_IN_ADDR_TOKEN :
+ case AUT_IN_ADDR:
return fetch_inaddr_tok(tok, buf, len);
- case AU_IN_ADDR_EX_TOKEN :
+ case AUT_IN_ADDR_EX:
return fetch_inaddr_ex_tok(tok, buf, len);
- case AU_IP_TOKEN :
+ case AUT_IP:
return fetch_ip_tok(tok, buf, len);
- case AU_IPC_TOKEN :
+ case AUT_IPC:
return fetch_ipc_tok(tok, buf, len);
- case AU_IPCPERM_TOKEN :
+ case AUT_IPC_PERM:
return fetch_ipcperm_tok(tok, buf, len);
- case AU_IPORT_TOKEN :
+ case AUT_IPORT:
return fetch_iport_tok(tok, buf, len);
- case AU_OPAQUE_TOKEN :
+ case AUT_OPAQUE:
return fetch_opaque_tok(tok, buf, len);
- case AU_PATH_TOKEN :
+ case AUT_PATH:
return fetch_path_tok(tok, buf, len);
- case AU_PROCESS_32_TOKEN :
+ case AUT_PROCESS32:
return fetch_process32_tok(tok, buf, len);
- case AU_PROCESS_32_EX_TOKEN :
+ case AUT_PROCESS32_EX:
return fetch_process32ex_tok(tok, buf, len);
- case AU_RETURN_32_TOKEN :
+ case AUT_RETURN32:
return fetch_return32_tok(tok, buf, len);
- case AU_RETURN_64_TOKEN :
+ case AUT_RETURN64:
return fetch_return64_tok(tok, buf, len);
- case AU_SEQ_TOKEN :
+ case AUT_SEQ:
return fetch_seq_tok(tok, buf, len);
- case AU_SOCK_TOKEN :
+ case AUT_SOCKET:
return fetch_socket_tok(tok, buf, len);
- case AU_SOCK_INET_32_TOKEN :
+ case AUT_SOCKINET32:
return fetch_sock_inet32_tok(tok, buf, len);
- case AU_SOCK_UNIX_TOKEN :
+ case AUT_SOCKUNIX:
return fetch_sock_unix_tok(tok, buf, len);
- case AU_SUBJECT_32_TOKEN :
+ case AUT_SUBJECT32:
return fetch_subject32_tok(tok, buf, len);
- case AU_SUBJECT_64_TOKEN :
+ case AUT_SUBJECT64:
return fetch_subject64_tok(tok, buf, len);
- case AU_SUBJECT_32_EX_TOKEN :
+ case AUT_SUBJECT32_EX:
return fetch_subject32ex_tok(tok, buf, len);
- case AU_TEXT_TOKEN :
+ case AUT_TEXT:
return fetch_text_tok(tok, buf, len);
- case AU_SOCK_EX32_TOKEN :
+ case AUT_SOCKET_EX:
return fetch_socketex32_tok(tok, buf, len);
- case AU_ARB_TOKEN :
+ case AUT_DATA:
return fetch_arb_tok(tok, buf, len);
default:
@@ -2398,106 +2398,106 @@
{
switch(tok->id) {
- case AU_HEADER_32_TOKEN :
+ case AUT_HEADER32:
return print_header32_tok(outfp, tok, del, raw, sfrm);
- case AU_HEADER_64_TOKEN:
+ case AUT_HEADER64:
return print_header64_tok(outfp, tok, del, raw, sfrm);
- case AU_TRAILER_TOKEN :
+ case AUT_TRAILER:
return print_trailer_tok(outfp, tok, del, raw, sfrm);
- case AU_ARG32_TOKEN :
+ case AUT_ARG32:
return print_arg32_tok(outfp, tok, del, raw, sfrm);
- case AU_ARG64_TOKEN :
+ case AUT_ARG64:
return print_arg64_tok(outfp, tok, del, raw, sfrm);
- case AU_ARB_TOKEN :
+ case AUT_DATA:
return print_arb_tok(outfp, tok, del, raw, sfrm);
- case AU_ATTR32_TOKEN :
+ case AUT_ATTR32:
return print_attr32_tok(outfp, tok, del, raw, sfrm);
- case AU_ATTR64_TOKEN :
+ case AUT_ATTR64:
return print_attr64_tok(outfp, tok, del, raw, sfrm);
- case AU_EXIT_TOKEN :
+ case AUT_EXIT:
return print_exit_tok(outfp, tok, del, raw, sfrm);
- case AU_EXEC_ARG_TOKEN :
+ case AUT_EXEC_ARGS:
return print_execarg_tok(outfp, tok, del, raw, sfrm);
- case AU_EXEC_ENV_TOKEN :
+ case AUT_EXEC_ENV:
return print_execenv_tok(outfp, tok, del, raw, sfrm);
- case AU_FILE_TOKEN :
+ case AUT_OTHER_FILE32:
return print_file_tok(outfp, tok, del, raw, sfrm);
- case AU_NEWGROUPS_TOKEN :
+ case AUT_NEWGROUPS:
return print_newgroups_tok(outfp, tok, del, raw, sfrm);
- case AU_IN_ADDR_TOKEN :
+ case AUT_IN_ADDR:
return print_inaddr_tok(outfp, tok, del, raw, sfrm);
- case AU_IN_ADDR_EX_TOKEN :
+ case AUT_IN_ADDR_EX:
return print_inaddr_ex_tok(outfp, tok, del, raw, sfrm);
- case AU_IP_TOKEN :
+ case AUT_IP:
return print_ip_tok(outfp, tok, del, raw, sfrm);
- case AU_IPC_TOKEN :
+ case AUT_IPC:
return print_ipc_tok(outfp, tok, del, raw, sfrm);
- case AU_IPCPERM_TOKEN :
+ case AUT_IPC_PERM:
return print_ipcperm_tok(outfp, tok, del, raw, sfrm);
- case AU_IPORT_TOKEN :
+ case AUT_IPORT:
return print_iport_tok(outfp, tok, del, raw, sfrm);
- case AU_OPAQUE_TOKEN :
+ case AUT_OPAQUE:
return print_opaque_tok(outfp, tok, del, raw, sfrm);
- case AU_PATH_TOKEN :
+ case AUT_PATH:
return print_path_tok(outfp, tok, del, raw, sfrm);
- case AU_PROCESS_32_TOKEN :
+ case AUT_PROCESS32:
return print_process32_tok(outfp, tok, del, raw, sfrm);
- case AU_PROCESS_32_EX_TOKEN :
+ case AUT_PROCESS32_EX:
return print_process32ex_tok(outfp, tok, del, raw, sfrm);
- case AU_RETURN_32_TOKEN :
+ case AUT_RETURN32:
return print_return32_tok(outfp, tok, del, raw, sfrm);
- case AU_RETURN_64_TOKEN :
+ case AUT_RETURN64:
return print_return64_tok(outfp, tok, del, raw, sfrm);
- case AU_SEQ_TOKEN :
+ case AUT_SEQ:
return print_seq_tok(outfp, tok, del, raw, sfrm);
- case AU_SOCK_TOKEN :
+ case AUT_SOCKET:
return print_socket_tok(outfp, tok, del, raw, sfrm);
- case AU_SOCK_INET_32_TOKEN :
+ case AUT_SOCKINET32:
return print_sock_inet32_tok(outfp, tok, del, raw, sfrm);
- case AU_SOCK_UNIX_TOKEN :
+ case AUT_SOCKUNIX:
return print_sock_unix_tok(outfp, tok, del, raw, sfrm);
- case AU_SUBJECT_32_TOKEN :
+ case AUT_SUBJECT32:
return print_subject32_tok(outfp, tok, del, raw, sfrm);
- case AU_SUBJECT_64_TOKEN :
+ case AUT_SUBJECT64:
return print_subject64_tok(outfp, tok, del, raw, sfrm);
- case AU_SUBJECT_32_EX_TOKEN :
+ case AUT_SUBJECT32_EX:
return print_subject32ex_tok(outfp, tok, del, raw, sfrm);
- case AU_TEXT_TOKEN :
+ case AUT_TEXT:
return print_text_tok(outfp, tok, del, raw, sfrm);
- case AU_SOCK_EX32_TOKEN :
+ case AUT_SOCKET_EX:
return print_socketex32_tok(outfp, tok, del, raw, sfrm);
default:
@@ -2530,10 +2530,10 @@
type = fgetc(fp);
switch (type) {
- case AU_HEADER_32_TOKEN:
- case AU_HEADER_EX_32_TOKEN:
- case AU_HEADER_64_TOKEN:
- case AU_HEADER_EX_64_TOKEN:
+ case AUT_HEADER32:
+ case AUT_HEADER32_EX:
+ case AUT_HEADER64:
+ case AUT_HEADER64_EX:
/* read the record size from the token */
if (fread(&recsize, 1, sizeof(u_int32_t), fp) <
sizeof(u_int32_t)) {
@@ -2570,7 +2570,7 @@
}
break;
- case AU_FILE_TOKEN:
+ case AUT_OTHER_FILE32:
/*
* The file token is variable-length, as it includes a
* pathname. As a result, we have to read incrementally
==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#13 (text+ko) ====
@@ -100,7 +100,7 @@
textlen += 1;
- ADD_U_CHAR(dptr, AU_ARG32_TOKEN);
+ ADD_U_CHAR(dptr, AUT_ARG32);
ADD_U_CHAR(dptr, n);
ADD_U_INT32(dptr, v);
ADD_U_INT16(dptr, textlen);
@@ -129,7 +129,7 @@
textlen += 1;
- ADD_U_CHAR(dptr, AU_ARG64_TOKEN);
+ ADD_U_CHAR(dptr, AUT_ARG64);
ADD_U_CHAR(dptr, n);
ADD_U_INT64(dptr, v);
ADD_U_INT16(dptr, textlen);
@@ -172,7 +172,7 @@
return NULL;
}
- ADD_U_CHAR(dptr, AU_ATTR32_TOKEN);
+ ADD_U_CHAR(dptr, AUT_ATTR32);
/*
* Darwin defines the size for the file mode
@@ -260,7 +260,7 @@
return NULL;
}
- ADD_U_CHAR(dptr, AU_ARB_TOKEN);
+ ADD_U_CHAR(dptr, AUT_DATA);
ADD_U_CHAR(dptr, unit_print);
ADD_U_CHAR(dptr, unit_type);
ADD_U_CHAR(dptr, unit_count);
@@ -285,7 +285,7 @@
return NULL;
}
- ADD_U_CHAR(dptr, AU_EXIT_TOKEN);
+ ADD_U_CHAR(dptr, AUT_EXIT);
ADD_U_INT32(dptr, err);
ADD_U_INT32(dptr, retval);
@@ -320,7 +320,7 @@
return NULL;
}
- ADD_U_CHAR(dptr, AU_NEWGROUPS_TOKEN);
+ ADD_U_CHAR(dptr, AUT_NEWGROUPS);
ADD_U_INT16(dptr, n);
for(i = 0; i < n; i++) {
ADD_U_INT32(dptr, groups[i]);
@@ -351,7 +351,7 @@
return NULL;
}
- ADD_U_CHAR(dptr, AU_IN_ADDR_TOKEN);
+ ADD_U_CHAR(dptr, AUT_IN_ADDR);
ADD_U_INT32(dptr, internet_addr->s_addr);
return t;
@@ -378,7 +378,7 @@
return NULL;
}
- ADD_U_CHAR(dptr, AU_IN_ADDR_EX_TOKEN);
+ ADD_U_CHAR(dptr, AUT_IN_ADDR_EX);
ADD_U_INT32(dptr, type);
ADD_U_INT32(dptr, internet_addr->__u6_addr.__u6_addr32[0]);
ADD_U_INT32(dptr, internet_addr->__u6_addr.__u6_addr32[1]);
@@ -407,7 +407,7 @@
return NULL;
}
- ADD_U_CHAR(dptr, AU_IP_TOKEN);
+ ADD_U_CHAR(dptr, AUT_IP);
/*
* XXXRW: Any byte order work needed on the IP header before writing?
*/
@@ -432,7 +432,7 @@
return NULL;
}
- ADD_U_CHAR(dptr, AU_IPC_TOKEN);
+ ADD_U_CHAR(dptr, AUT_IPC);
ADD_U_CHAR(dptr, type);
ADD_U_INT32(dptr, id);
@@ -466,7 +466,7 @@
return NULL;
}
- ADD_U_CHAR(dptr, AU_IPCPERM_TOKEN);
+ ADD_U_CHAR(dptr, AUT_IPC_PERM);
/*
@@ -512,7 +512,7 @@
return NULL;
}
- ADD_U_CHAR(dptr, AU_IPORT_TOKEN);
+ ADD_U_CHAR(dptr, AUT_IPORT);
ADD_U_INT16(dptr, iport);
return t;
@@ -539,7 +539,7 @@
return NULL;
}
- ADD_U_CHAR(dptr, AU_OPAQUE_TOKEN);
+ ADD_U_CHAR(dptr, AUT_OPAQUE);
ADD_U_INT16(dptr, bytes);
ADD_MEM(dptr, data, bytes);
@@ -579,7 +579,7 @@
filelen += 1;
timems = tm.tv_usec/1000;
- ADD_U_CHAR(dptr, AU_FILE_TOKEN);
+ ADD_U_CHAR(dptr, AUT_OTHER_FILE32);
ADD_U_INT32(dptr, tm.tv_sec);
ADD_U_INT32(dptr, timems); /* We need time in ms */
ADD_U_INT16(dptr, filelen);
@@ -613,7 +613,7 @@
textlen += 1;
- ADD_U_CHAR(dptr, AU_TEXT_TOKEN);
+ ADD_U_CHAR(dptr, AUT_TEXT);
ADD_U_INT16(dptr, textlen);
ADD_STRING(dptr, text, textlen);
@@ -643,7 +643,7 @@
textlen += 1;
- ADD_U_CHAR(dptr, AU_PATH_TOKEN);
+ ADD_U_CHAR(dptr, AUT_PATH);
ADD_U_INT16(dptr, textlen);
ADD_STRING(dptr, text, textlen);
@@ -680,7 +680,7 @@
return NULL;
}
- ADD_U_CHAR(dptr, AU_PROCESS_32_TOKEN);
+ ADD_U_CHAR(dptr, AUT_PROCESS32);
ADD_U_INT32(dptr, auid);
ADD_U_INT32(dptr, euid);
ADD_U_INT32(dptr, egid);
@@ -742,7 +742,7 @@
return NULL;
}
- ADD_U_CHAR(dptr, AU_PROCESS_32_EX_TOKEN);
+ ADD_U_CHAR(dptr, AUT_PROCESS32_EX);
ADD_U_INT32(dptr, auid);
ADD_U_INT32(dptr, euid);
ADD_U_INT32(dptr, egid);
@@ -793,7 +793,7 @@
return NULL;
}
- ADD_U_CHAR(dptr, AU_RETURN_32_TOKEN);
+ ADD_U_CHAR(dptr, AUT_RETURN32);
ADD_U_CHAR(dptr, status);
ADD_U_INT32(dptr, ret);
@@ -811,7 +811,7 @@
return NULL;
}
- ADD_U_CHAR(dptr, AU_RETURN_64_TOKEN);
+ ADD_U_CHAR(dptr, AUT_RETURN64);
ADD_U_CHAR(dptr, status);
ADD_U_INT64(dptr, ret);
@@ -838,7 +838,7 @@
return NULL;
}
- ADD_U_CHAR(dptr, AU_SEQ_TOKEN);
+ ADD_U_CHAR(dptr, AUT_SEQ);
ADD_U_INT32(dptr, audit_count);
return t;
@@ -906,7 +906,7 @@
return NULL;
}
- ADD_U_CHAR(dptr, AU_SOCK_INET_32_TOKEN);
+ ADD_U_CHAR(dptr, AUT_SOCKINET32);
/*
* In Darwin, sin_family is one octet, but BSM defines the token
* to store two. So we copy in a 0 first.
@@ -935,7 +935,7 @@
return NULL;
}
- ADD_U_CHAR(dptr, AU_SOCK_INET_128_TOKEN);
+ ADD_U_CHAR(dptr, AUT_SOCKINET128);
/*
* In Darwin, sin6_family is one octet, but BSM defines the token
* to store two. So we copy in a 0 first.
@@ -988,7 +988,7 @@
return NULL;
}
- ADD_U_CHAR(dptr, AU_SUBJECT_32_TOKEN);
+ ADD_U_CHAR(dptr, AUT_SUBJECT32);
ADD_U_INT32(dptr, auid);
ADD_U_INT32(dptr, euid);
ADD_U_INT32(dptr, egid);
@@ -1050,7 +1050,7 @@
return NULL;
}
- ADD_U_CHAR(dptr, AU_SUBJECT_32_EX_TOKEN);
+ ADD_U_CHAR(dptr, AUT_SUBJECT32_EX);
ADD_U_INT32(dptr, auid);
ADD_U_INT32(dptr, euid);
ADD_U_INT32(dptr, egid);
@@ -1139,7 +1139,7 @@
return NULL;
}
- ADD_U_CHAR(dptr, AU_EXEC_ARG_TOKEN);
+ ADD_U_CHAR(dptr, AUT_EXEC_ARGS);
ADD_U_INT32(dptr, count);
for(i =0; i< count; i++) {
@@ -1186,7 +1186,7 @@
return NULL;
}
- ADD_U_CHAR(dptr, AU_EXEC_ENV_TOKEN);
+ ADD_U_CHAR(dptr, AUT_EXEC_ENV);
ADD_U_INT32(dptr, count);
for(i =0; i< count; i++) {
@@ -1224,7 +1224,7 @@
return NULL;
}
- ADD_U_CHAR(dptr, AU_HEADER_32_TOKEN);
+ ADD_U_CHAR(dptr, AUT_HEADER32);
ADD_U_INT32(dptr, rec_size);
ADD_U_CHAR(dptr, HEADER_VERSION);
ADD_U_INT16(dptr, e_type);
@@ -1267,7 +1267,7 @@
return NULL;
}
- ADD_U_CHAR(dptr, AU_TRAILER_TOKEN);
+ ADD_U_CHAR(dptr, AUT_TRAILER);
ADD_U_INT16(dptr, magic);
ADD_U_INT32(dptr, rec_size);
To Unsubscribe: send mail to majordomo at trustedbsd.org
with "unsubscribe trustedbsd-cvs" in the body of the message
More information about the trustedbsd-cvs
mailing list