diff options
| author | Marek Pospisil <Marek.Pospisil@Sun.COM> | 2009-11-26 04:33:44 -0800 |
|---|---|---|
| committer | Marek Pospisil <Marek.Pospisil@Sun.COM> | 2009-11-26 04:33:44 -0800 |
| commit | ddc42f882d0d14ab016a8405099fe8ad93170c00 (patch) | |
| tree | 482632512a46bf44ae54f1b4c3b1ee25b8fd8235 | |
| parent | fc621ef0ea706feeefe877e29c056b46fd3915b4 (diff) | |
| download | illumos-joyent-ddc42f882d0d14ab016a8405099fe8ad93170c00.tar.gz | |
6898247 The definition BSM_AUDITON is never used.
| -rw-r--r-- | usr/src/cmd/truss/print.c | 1 | ||||
| -rw-r--r-- | usr/src/uts/common/c2/audit.h | 2 | ||||
| -rw-r--r-- | usr/src/uts/common/c2/audit_event.c | 2 | ||||
| -rw-r--r-- | usr/src/uts/common/c2/audit_syscalls.c | 1 | ||||
| -rw-r--r-- | usr/src/uts/common/syscall/auditsys.c | 11 |
5 files changed, 5 insertions, 12 deletions
diff --git a/usr/src/cmd/truss/print.c b/usr/src/cmd/truss/print.c index f873c657c9..30dabbf934 100644 --- a/usr/src/cmd/truss/print.c +++ b/usr/src/cmd/truss/print.c @@ -1203,7 +1203,6 @@ prt_aud(private_t *pri, int raw, long val) /* print auditsys() code */ case BSM_GETAUDIT: s = "BSM_GETAUDIT"; break; case BSM_SETAUDIT: s = "BSM_SETAUDIT"; break; case BSM_AUDIT: s = "BSM_AUDIT"; break; - case BSM_AUDITON: s = "BSM_AUDITON"; break; case BSM_AUDITCTL: s = "BSM_AUDITCTL"; break; case BSM_GETAUDIT_ADDR: s = "BSM_GETAUDIT_ADDR"; break; case BSM_SETAUDIT_ADDR: s = "BSM_SETAUDIT_ADDR"; break; diff --git a/usr/src/uts/common/c2/audit.h b/usr/src/uts/common/c2/audit.h index 4ab4ad610e..b6d49a24dd 100644 --- a/usr/src/uts/common/c2/audit.h +++ b/usr/src/uts/common/c2/audit.h @@ -218,7 +218,7 @@ typedef au_id_t auid_t; #define BSM_AUDIT 25 /* 26 OBSOLETE */ /* 27 EOL announced for Sol 10 */ -#define BSM_AUDITON 28 +/* 28 OBSOLETE */ #define BSM_AUDITCTL 29 /* 30 OBSOLETE */ /* 31 OBSOLETE */ diff --git a/usr/src/uts/common/c2/audit_event.c b/usr/src/uts/common/c2/audit_event.c index 92d8a51117..fbb96fcaf3 100644 --- a/usr/src/uts/common/c2/audit_event.c +++ b/usr/src/uts/common/c2/audit_event.c @@ -2849,9 +2849,7 @@ aui_auditsys(au_event_t e) case BSM_AUDIT: e = AUE_AUDIT; break; - case BSM_AUDITON: case BSM_AUDITCTL: - switch ((uint_t)uap->a1) { case A_GETPOLICY: diff --git a/usr/src/uts/common/c2/audit_syscalls.c b/usr/src/uts/common/c2/audit_syscalls.c index 87c0c50d48..9cd0e6b403 100644 --- a/usr/src/uts/common/c2/audit_syscalls.c +++ b/usr/src/uts/common/c2/audit_syscalls.c @@ -189,7 +189,6 @@ _auditsys(struct auditcalls *uap, rval_t *rvp) case BSM_AUDITDOOR: result = auditdoor((int)uap->a1); break; - case BSM_AUDITON: case BSM_AUDITCTL: result = auditctl((int)uap->a1, (caddr_t)uap->a2, (int)uap->a3); break; diff --git a/usr/src/uts/common/syscall/auditsys.c b/usr/src/uts/common/syscall/auditsys.c index 0adf54ed36..a940bd7d18 100644 --- a/usr/src/uts/common/syscall/auditsys.c +++ b/usr/src/uts/common/syscall/auditsys.c @@ -19,12 +19,10 @@ * CDDL HEADER END */ /* - * Copyright 2008 Sun Microsystems, Inc. All rights reserved. + * Copyright 2009 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" - #include <sys/systm.h> #include <sys/errno.h> #include <sys/policy.h> @@ -38,9 +36,9 @@ auditsys(struct auditcalls *uap, rval_t *rvp) int err; /* - * this ugly hack is because auditsys returns 0 for - * all cases except audit_active == 0 and - * uap->code == BSM_AUDITCTRL || BSM_AUDITON || default) + * this ugly hack is because auditsys returns + * 0 for all cases except audit_active == 0 + * and uap->code == BSM_AUDITCTL || default) */ if (!audit_active) @@ -54,7 +52,6 @@ auditsys(struct auditcalls *uap, rval_t *rvp) case BSM_AUDIT: return (0); case BSM_AUDITCTL: - case BSM_AUDITON: if ((int)uap->a1 == A_GETCOND) err = secpolicy_audit_getattr(CRED()); else |