summaryrefslogtreecommitdiff
path: root/usr/src
diff options
context:
space:
mode:
Diffstat (limited to 'usr/src')
-rw-r--r--usr/src/cmd/truss/print.c1
-rw-r--r--usr/src/lib/libbsm/common/audit_class.c17
-rw-r--r--usr/src/lib/libbsm/common/audit_event.c16
-rw-r--r--usr/src/lib/libbsm/common/audit_user.c18
-rw-r--r--usr/src/lib/libbsm/common/bsm.c14
-rw-r--r--usr/src/lib/libbsm/common/getacinfo.c8
-rw-r--r--usr/src/lib/libbsm/common/libbsm.h5
-rw-r--r--usr/src/lib/libbsm/common/mapfile-vers4
-rw-r--r--usr/src/uts/common/c2/audit.h23
-rw-r--r--usr/src/uts/common/c2/audit_kevents.h2
10 files changed, 15 insertions, 93 deletions
diff --git a/usr/src/cmd/truss/print.c b/usr/src/cmd/truss/print.c
index f284539c1a..dbacfd034c 100644
--- a/usr/src/cmd/truss/print.c
+++ b/usr/src/cmd/truss/print.c
@@ -1204,7 +1204,6 @@ prt_aud(private_t *pri, int raw, long val) /* print auditsys() code */
case BSM_GETUSERAUDIT: s = "BSM_GETUSERAUDIT"; break;
case BSM_SETUSERAUDIT: s = "BSM_SETUSERAUDIT"; break;
case BSM_AUDIT: s = "BSM_AUDIT"; break;
- case BSM_AUDITUSER: s = "BSM_AUDITUSER"; break;
case BSM_AUDITSVC: s = "BSM_AUDITSVC"; break;
case BSM_AUDITON: s = "BSM_AUDITON"; break;
case BSM_AUDITCTL: s = "BSM_AUDITCTL"; break;
diff --git a/usr/src/lib/libbsm/common/audit_class.c b/usr/src/lib/libbsm/common/audit_class.c
index d727a6b033..94f2a6d2a7 100644
--- a/usr/src/lib/libbsm/common/audit_class.c
+++ b/usr/src/lib/libbsm/common/audit_class.c
@@ -46,23 +46,6 @@ static mutex_t mutex_classcache = DEFAULTMUTEX;
extern int _mutex_lock(mutex_t *);
extern int _mutex_unlock(mutex_t *);
-int
-#ifdef __STDC__
-setauclassfile(char *fname)
-#else
-setauclassfile(fname)
- char *fname;
-#endif
-{
- _mutex_lock(&mutex_classfile);
- if (fname) {
- (void) strcpy(au_class_fname, fname);
- }
- _mutex_unlock(&mutex_classfile);
- return (0);
-}
-
-
void
setauclass()
{
diff --git a/usr/src/lib/libbsm/common/audit_event.c b/usr/src/lib/libbsm/common/audit_event.c
index 1c3e08bd36..977e984f7a 100644
--- a/usr/src/lib/libbsm/common/audit_event.c
+++ b/usr/src/lib/libbsm/common/audit_event.c
@@ -74,22 +74,6 @@ static int cacheauclass_failure = 0;
extern int _mutex_lock(mutex_t *);
extern int _mutex_unlock(mutex_t *);
-int
-#ifdef __STDC__
-setaueventfile(char *fname)
-#else
-setaueventfile(fname)
- char *fname;
-#endif
-{
- _mutex_lock(&mutex_eventfile);
- if (fname) {
- (void) strcpy(au_event_fname, fname);
- }
- _mutex_unlock(&mutex_eventfile);
- return (0);
-}
-
void
setauevent()
diff --git a/usr/src/lib/libbsm/common/audit_user.c b/usr/src/lib/libbsm/common/audit_user.c
index 27c8967162..19d68b1dc5 100644
--- a/usr/src/lib/libbsm/common/audit_user.c
+++ b/usr/src/lib/libbsm/common/audit_user.c
@@ -60,24 +60,6 @@ extern au_user_str_t *_getauuserent(au_user_str_t *, char *, int, int *);
extern au_user_str_t *_getauusernam(char *, au_user_str_t *, char *, int,
int *);
-#ifdef __STDC__
-int
-setauuserfile(char *fname)
-#else
-int
-setauuserfile(fname)
- char *fname;
-#endif
-{
- _mutex_lock(&mutex_userfile);
- if (fname) {
- (void) strcpy(au_user_fname, fname);
- use_nsswitch = 0;
- }
- _mutex_unlock(&mutex_userfile);
- return (0);
-}
-
void
setauuser()
diff --git a/usr/src/lib/libbsm/common/bsm.c b/usr/src/lib/libbsm/common/bsm.c
index 49da982380..056eff49ef 100644
--- a/usr/src/lib/libbsm/common/bsm.c
+++ b/usr/src/lib/libbsm/common/bsm.c
@@ -2,9 +2,8 @@
* CDDL HEADER START
*
* The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License"). You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
*
* You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
* or http://www.opensolaris.org/os/licensing.
@@ -20,7 +19,7 @@
* CDDL HEADER END
*/
/*
- * Copyright 2003 Sun Microsystems, Inc. All rights reserved.
+ * Copyright 2006 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
*/
@@ -55,13 +54,6 @@ audit(char *record, int length)
int
-audituser(char *record)
-{
- return (syscall(SYS_auditsys, BSM_AUDITUSER, record));
-}
-
-
-int
getauid(au_id_t *auid)
{
return (syscall(SYS_auditsys, BSM_GETAUID, auid));
diff --git a/usr/src/lib/libbsm/common/getacinfo.c b/usr/src/lib/libbsm/common/getacinfo.c
index 1a117301b1..cb591b533a 100644
--- a/usr/src/lib/libbsm/common/getacinfo.c
+++ b/usr/src/lib/libbsm/common/getacinfo.c
@@ -476,11 +476,3 @@ endac()
DIRINIT = 0;
_mutex_unlock(&mutex_acf);
}
-
-int
-testac()
-{
- if (acf == NULL)
- return (1);
- return (0);
-}
diff --git a/usr/src/lib/libbsm/common/libbsm.h b/usr/src/lib/libbsm/common/libbsm.h
index a9978d1725..62fb0e8bc8 100644
--- a/usr/src/lib/libbsm/common/libbsm.h
+++ b/usr/src/lib/libbsm/common/libbsm.h
@@ -148,7 +148,6 @@ extern int au_write(int, token_t *);
extern void setauevent(void);
extern void endauevent(void);
-extern int setaueventfile(char *);
extern au_event_ent_t *getauevent(void);
extern au_event_ent_t *getauevent_r(au_event_ent_t *);
@@ -166,7 +165,6 @@ extern int cacheauevent(au_event_ent_t **, au_event_t);
extern void setauclass(void);
extern void endauclass(void);
-extern int setauclassfile(char *);
extern int cacheauclass(au_class_ent_t **, au_class_t);
extern int cacheauclassnam(au_class_ent_t **, char *);
@@ -181,7 +179,6 @@ extern au_class_ent_t *getauclassnam_r(au_class_ent_t *, char *);
void setauuser(void);
void endauuser(void);
-int setauuserfile(char *);
au_user_ent_t *getauuserent(void);
au_user_ent_t *getauuserent_r(au_user_ent_t *);
@@ -194,7 +191,6 @@ au_user_ent_t *getauusernam_r(au_user_ent_t *, char *);
void endac(void);
void setac(void);
-int testac(void);
int getacdir(char *, int);
int getacmin(int *);
@@ -235,7 +231,6 @@ extern int auditon(int, caddr_t, int);
extern int auditstat(au_stat_t *);
extern int auditsvc(int, int);
extern int auditdoor(int);
-extern int audituser(char *);
extern int getaudit(auditinfo_t *);
extern int getaudit_addr(auditinfo_addr_t *, int);
extern int getauid(au_id_t *);
diff --git a/usr/src/lib/libbsm/common/mapfile-vers b/usr/src/lib/libbsm/common/mapfile-vers
index 376987e7b6..acc6fa2d5f 100644
--- a/usr/src/lib/libbsm/common/mapfile-vers
+++ b/usr/src/lib/libbsm/common/mapfile-vers
@@ -107,14 +107,10 @@ SUNW_0.7 {
getfauditflags;
setac;
setauclass;
- setauclassfile;
setaudit;
setauevent;
- setaueventfile;
setauid;
setauuser;
- setauuserfile;
- testac;
};
SUNWprivate_1.1 {
diff --git a/usr/src/uts/common/c2/audit.h b/usr/src/uts/common/c2/audit.h
index 06cb626992..9db342f6ee 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_GETUSERAUDIT 23
#define BSM_SETUSERAUDIT 24
#define BSM_AUDIT 25
-#define BSM_AUDITUSER 26
+/* 26 OBSOLETE */
#define BSM_AUDITSVC 27 /* EOL announced for Sol 10 */
#define BSM_AUDITON 28
#define BSM_AUDITCTL 29
@@ -267,16 +267,15 @@ typedef au_id_t auid_t;
#define AUDIT_ARGE 0x0008 /* include arge with execv system call events */
#define AUDIT_SEQ 0x0010 /* include sequence attribute */
#define AUDIT_WINDATA 0x0020 /* include interwindow moved data */
-#define AUDIT_USER 0x0040 /* make audituser(2) un-privileged */
-#define AUDIT_GROUP 0x0080 /* include group attribute with each record */
-#define AUDIT_TRAIL 0x0100 /* include trailer token */
-#define AUDIT_PATH 0x0200 /* allow multiple paths per event */
-#define AUDIT_SCNT 0x0400 /* sleep user events but not kernel events */
-#define AUDIT_PUBLIC 0x0800 /* audit even "public" files */
-#define AUDIT_ZONENAME 0x1000 /* emit zonename token */
-#define AUDIT_PERZONE 0x2000 /* auditd and audit queue for each zone */
-#define AUDIT_WINDATA_DOWN 0x4000 /* include paste downgraded data */
-#define AUDIT_WINDATA_UP 0x8000 /* include paste upgraded data */
+#define AUDIT_GROUP 0x0040 /* include group attribute with each record */
+#define AUDIT_TRAIL 0x0080 /* include trailer token */
+#define AUDIT_PATH 0x0100 /* allow multiple paths per event */
+#define AUDIT_SCNT 0x0200 /* sleep user events but not kernel events */
+#define AUDIT_PUBLIC 0x0400 /* audit even "public" files */
+#define AUDIT_ZONENAME 0x0800 /* emit zonename token */
+#define AUDIT_PERZONE 0x1000 /* auditd and audit queue for each zone */
+#define AUDIT_WINDATA_DOWN 0x2000 /* include paste downgraded data */
+#define AUDIT_WINDATA_UP 0x4000 /* include paste upgraded data */
/*
* If AUDIT_GLOBAL changes, corresponding changes are required in
@@ -284,7 +283,7 @@ typedef au_id_t auid_t;
*/
#define AUDIT_GLOBAL (AUDIT_AHLT | AUDIT_PERZONE)
#define AUDIT_LOCAL (AUDIT_CNT | AUDIT_ARGV | AUDIT_ARGE |\
- AUDIT_SEQ | AUDIT_WINDATA | AUDIT_USER |\
+ AUDIT_SEQ | AUDIT_WINDATA |\
AUDIT_GROUP | AUDIT_TRAIL | AUDIT_PATH |\
AUDIT_PUBLIC | AUDIT_SCNT | AUDIT_ZONENAME |\
AUDIT_WINDATA_DOWN | AUDIT_WINDATA_UP)
diff --git a/usr/src/uts/common/c2/audit_kevents.h b/usr/src/uts/common/c2/audit_kevents.h
index 4a2e5b27db..aa0de68189 100644
--- a/usr/src/uts/common/c2/audit_kevents.h
+++ b/usr/src/uts/common/c2/audit_kevents.h
@@ -173,7 +173,7 @@ extern "C" {
#define AUE_GETUSERAUDIT 134 /* =no getuseraudit(2) */
#define AUE_SETUSERAUDIT 135 /* =no setuseraudit(2) */
#define AUE_AUDITSVC 136 /* =as auditsvc(2) */
-#define AUE_AUDITUSER 137 /* =no audituser(2) */
+/* 137 OBSOLETE */
#define AUE_AUDITON 138 /* =no auditon(2) */
#define AUE_AUDITON_GTERMID 139 /* =no auditctl(2): GETTERMID */
#define AUE_AUDITON_STERMID 140 /* =no auditctl(2): SETTERMID */
generated by cgit v1.2.3 (git 2.39.1) at 2025-06-05 09:14:51 +0000