summaryrefslogtreecommitdiff
path: root/usr/src
diff options
context:
space:
mode:
Diffstat (limited to 'usr/src')
-rw-r--r--usr/src/cmd/bsmrecord/audit_record_attr.txt2
-rw-r--r--usr/src/cmd/truss/print.c7
-rw-r--r--usr/src/lib/libbsm/common/bsm.c39
-rw-r--r--usr/src/lib/libbsm/common/libbsm.h7
-rw-r--r--usr/src/uts/common/c2/audit.h16
-rw-r--r--usr/src/uts/common/c2/audit_event.c4
-rw-r--r--usr/src/uts/common/c2/audit_kevents.h14
7 files changed, 18 insertions, 71 deletions
diff --git a/usr/src/cmd/bsmrecord/audit_record_attr.txt b/usr/src/cmd/bsmrecord/audit_record_attr.txt
index 21ab6189f8..49045c7048 100644
--- a/usr/src/cmd/bsmrecord/audit_record_attr.txt
+++ b/usr/src/cmd/bsmrecord/audit_record_attr.txt
@@ -876,7 +876,7 @@ label=AUE_GETPMSG
comment=1, file descriptor, "fd"
label=AUE_GETPORTAUDIT
- format=kernel
+ format=Not used.
label=AUE_GETUSERAUDIT
skip=Not used.
diff --git a/usr/src/cmd/truss/print.c b/usr/src/cmd/truss/print.c
index d3b095247a..26a6daf30b 100644
--- a/usr/src/cmd/truss/print.c
+++ b/usr/src/cmd/truss/print.c
@@ -1213,16 +1213,9 @@ prt_aud(private_t *pri, int raw, long val) /* print auditsys() code */
case BSM_SETAUID: s = "BSM_SETAUID"; break;
case BSM_GETAUDIT: s = "BSM_GETAUDIT"; break;
case BSM_SETAUDIT: s = "BSM_SETAUDIT"; break;
- case BSM_GETUSERAUDIT: s = "BSM_GETUSERAUDIT"; break;
- case BSM_SETUSERAUDIT: s = "BSM_SETUSERAUDIT"; break;
case BSM_AUDIT: s = "BSM_AUDIT"; break;
case BSM_AUDITON: s = "BSM_AUDITON"; break;
case BSM_AUDITCTL: s = "BSM_AUDITCTL"; break;
- case BSM_GETKERNSTATE: s = "BSM_GETKERNSTATE"; break;
- case BSM_SETKERNSTATE: s = "BSM_SETKERNSTATE"; break;
- case BSM_GETPORTAUDIT: s = "BSM_GETPORTAUDIT"; break;
- case BSM_REVOKE: s = "BSM_REVOKE"; break;
- case BSM_AUDITSTAT: s = "BSM_AUDITSTAT"; break;
case BSM_GETAUDIT_ADDR: s = "BSM_GETAUDIT_ADDR"; break;
case BSM_SETAUDIT_ADDR: s = "BSM_SETAUDIT_ADDR"; break;
}
diff --git a/usr/src/lib/libbsm/common/bsm.c b/usr/src/lib/libbsm/common/bsm.c
index c97d9ea344..6b077b6d60 100644
--- a/usr/src/lib/libbsm/common/bsm.c
+++ b/usr/src/lib/libbsm/common/bsm.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/syscall.h>
#include <sys/types.h>
#include <bsm/audit.h>
@@ -62,20 +60,6 @@ setauid(au_id_t *auid)
int
-getuseraudit(au_id_t uid, au_mask_t *mask)
-{
- return (syscall(SYS_auditsys, BSM_GETUSERAUDIT, uid, mask));
-}
-
-
-int
-setuseraudit(au_id_t uid, au_mask_t *mask)
-{
- return (syscall(SYS_auditsys, BSM_SETUSERAUDIT, uid, mask));
-}
-
-
-int
getaudit(auditinfo_t *ai)
{
return (syscall(SYS_auditsys, BSM_GETAUDIT, ai));
@@ -103,28 +87,7 @@ setaudit_addr(auditinfo_addr_t *ai, int len)
int
-getkernstate(au_mask_t *mask)
-{
- return (syscall(SYS_auditsys, BSM_GETKERNSTATE, mask));
-}
-
-
-int
-setkernstate(au_mask_t *mask)
-{
- return (syscall(SYS_auditsys, BSM_SETKERNSTATE, mask));
-}
-
-
-int
auditon(int cmd, caddr_t data, int length)
{
return (syscall(SYS_auditsys, BSM_AUDITCTL, cmd, data, length));
}
-
-
-int
-auditstat(au_stat_t *stat)
-{
- return (syscall(SYS_auditsys, BSM_AUDITSTAT, stat));
-}
diff --git a/usr/src/lib/libbsm/common/libbsm.h b/usr/src/lib/libbsm/common/libbsm.h
index d09bfcb7b1..bf0f4ea76d 100644
--- a/usr/src/lib/libbsm/common/libbsm.h
+++ b/usr/src/lib/libbsm/common/libbsm.h
@@ -19,7 +19,7 @@
* 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.
*/
@@ -230,18 +230,13 @@ extern int getfauditflags(au_mask_t *, au_mask_t *, au_mask_t *);
extern int audit(char *, int);
extern int auditon(int, caddr_t, int);
-extern int auditstat(au_stat_t *);
extern int auditdoor(int);
extern int getaudit(auditinfo_t *);
extern int getaudit_addr(auditinfo_addr_t *, int);
extern int getauid(au_id_t *);
-extern int getkernstate(au_mask_t *);
-extern int getuseraudit(au_id_t, au_mask_t *);
extern int setaudit(auditinfo_t *);
extern int setaudit_addr(auditinfo_addr_t *, int);
extern int setauid(au_id_t *);
-extern int setkernstate(au_mask_t *);
-extern int setuseraudit(au_id_t, au_mask_t *);
#define BSM_TEXTBUFSZ 256 /* size of string for generic text token */
diff --git a/usr/src/uts/common/c2/audit.h b/usr/src/uts/common/c2/audit.h
index c5c1b70923..05e11099ca 100644
--- a/usr/src/uts/common/c2/audit.h
+++ b/usr/src/uts/common/c2/audit.h
@@ -19,7 +19,7 @@
* 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.
*/
@@ -213,18 +213,18 @@ typedef au_id_t auid_t;
#define BSM_SETAUID 20
#define BSM_GETAUDIT 21
#define BSM_SETAUDIT 22
-#define BSM_GETUSERAUDIT 23
-#define BSM_SETUSERAUDIT 24
+/* 23 OBSOLETE */
+/* 24 OBSOLETE */
#define BSM_AUDIT 25
/* 26 OBSOLETE */
/* 27 EOL announced for Sol 10 */
#define BSM_AUDITON 28
#define BSM_AUDITCTL 29
-#define BSM_GETKERNSTATE 30
-#define BSM_SETKERNSTATE 31
-#define BSM_GETPORTAUDIT 32
-#define BSM_REVOKE 33
-#define BSM_AUDITSTAT 34
+/* 30 OBSOLETE */
+/* 31 OBSOLETE */
+/* 32 OBSOLETE */
+/* 33 OBSOLETE */
+/* 34 OBSOLETE */
#define BSM_GETAUDIT_ADDR 35
#define BSM_SETAUDIT_ADDR 36
#define BSM_AUDITDOOR 37
diff --git a/usr/src/uts/common/c2/audit_event.c b/usr/src/uts/common/c2/audit_event.c
index 68714359c0..697794e487 100644
--- a/usr/src/uts/common/c2/audit_event.c
+++ b/usr/src/uts/common/c2/audit_event.c
@@ -2784,9 +2784,6 @@ aui_auditsys(au_event_t e)
case BSM_AUDIT:
e = AUE_AUDIT;
break;
- case BSM_GETPORTAUDIT:
- e = AUE_GETPORTAUDIT;
- break;
case BSM_AUDITON:
case BSM_AUDITCTL:
@@ -3035,7 +3032,6 @@ aus_auditsys(struct t_audit_data *tad)
case AUE_GETAUDIT:
case AUE_GETAUDIT_ADDR:
case AUE_AUDIT:
- case AUE_GETPORTAUDIT:
case AUE_AUDITON_GPOLICY:
case AUE_AUDITON_GQCTRL:
case AUE_AUDITON_GETKMASK:
diff --git a/usr/src/uts/common/c2/audit_kevents.h b/usr/src/uts/common/c2/audit_kevents.h
index cbd1d478d6..dd6bc877ba 100644
--- a/usr/src/uts/common/c2/audit_kevents.h
+++ b/usr/src/uts/common/c2/audit_kevents.h
@@ -168,8 +168,8 @@ extern "C" {
#define AUE_SETAUID 131 /* =aa setauid(2) */
#define AUE_GETAUDIT 132 /* =aa getaudit(2) */
#define AUE_SETAUDIT 133 /* =aa setaudit(2) */
-#define AUE_GETUSERAUDIT 134 /* =no getuseraudit(2) */
-#define AUE_SETUSERAUDIT 135 /* =no setuseraudit(2) */
+/* 134 OBSOLETE */
+/* 135 OBSOLETE */
/* 136 OBSOLETE */
/* 137 OBSOLETE */
#define AUE_AUDITON 138 /* =no auditon(2) */
@@ -181,11 +181,11 @@ extern "C" {
#define AUE_AUDITON_SESTATE 144 /* =no auditctl(2): SETESTATE */
#define AUE_AUDITON_GQCTRL 145 /* =as auditctl(2): GETQCTRL */
#define AUE_AUDITON_SQCTRL 146 /* =as auditctl(2): SETQCTRL */
-#define AUE_GETKERNSTATE 147 /* =no getkernstate(2) */
-#define AUE_SETKERNSTATE 148 /* =no setkernstate(2) */
-#define AUE_GETPORTAUDIT 149 /* =no getportaudit(2) */
-#define AUE_AUDITSTAT 150 /* =no auditstat(2) */
-#define AUE_REVOKE 151 /* =no revoke(2) */
+/* 147 OBSOLETE */
+/* 148 OBSOLETE */
+/* 149 OBSOLETE */
+/* 150 OBSOLETE */
+/* 151 OBSOLETE */
#define AUE_MAC 152 /* =no MAC use */
#define AUE_ENTERPROM 153 /* =na enter prom */
#define AUE_EXITPROM 154 /* =na exit prom */
generated by cgit v1.2.3 (git 2.39.1) at 2025-05-19 17:00:12 +0000