PSARC/2006/213 FMRI Audit Token

6401913 add FMRI audit token type to the adt_* infrastructure

1 files changed, 4 insertions, 20 deletions

diff --git a/usr/src/lib/libscf/common/lowlevel.c b/usr/src/lib/libscf/common/lowlevel.c
index 16c375d5e2..3223c05d7a 100644
--- a/usr/src/lib/libscf/common/lowlevel.c
+++ b/usr/src/lib/libscf/common/lowlevel.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 2005 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
@@ -5773,21 +5772,6 @@ struct scf_matchkey;
 struct scf_match;
 
 /*
- * scf_pattern_t
- */
-typedef struct scf_pattern {
-	enum	{
-		PATTERN_INVALID,	/* Uninitialized state */
-		PATTERN_EXACT,
-		PATTERN_GLOB,
-		PATTERN_PARTIAL
-	} sp_type;
-	char			*sp_arg;	/* Original argument */
-	struct scf_match	*sp_matches;	/* List of matches */
-	int			sp_matchcount;	/* # of matches */
-} scf_pattern_t;
-
-/*
  * scf_matchkey_t
  */
 typedef struct scf_matchkey {
@@ -5940,7 +5924,7 @@ scf_add_match(scf_matchkey_t **htable, const char *fmri, const char *legacy,
 /*
  * Returns 1 if the fmri matches the given pattern, 0 otherwise.
  */
-static int
+int
 scf_cmp_pattern(char *fmri, scf_pattern_t *pattern)
 {
 	char *tmp;