diff options
| author | dp <none@none> | 2006-03-09 01:36:44 -0800 |
|---|---|---|
| committer | dp <none@none> | 2006-03-09 01:36:44 -0800 |
| commit | 6927f468b0af7710df000f6b16f6ee413e1e3007 (patch) | |
| tree | 7402871f85c8bdc366c20b330ea94441180ff760 /usr/src/cmd/auditd | |
| parent | fea70b5430ad76f6dd4330a35518de5f17b52e96 (diff) | |
| download | illumos-joyent-6927f468b0af7710df000f6b16f6ee413e1e3007.tar.gz | |
PSARC/2006/163 SMF_ZONENAME variable for smf_method(5)
6392792 calls to zonename(1) should be standardized, minimized
Diffstat (limited to 'usr/src/cmd/auditd')
| -rw-r--r-- | usr/src/cmd/auditd/svc-auditd | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/usr/src/cmd/auditd/svc-auditd b/usr/src/cmd/auditd/svc-auditd index cfeae6a5db..f5dc38abfc 100644 --- a/usr/src/cmd/auditd/svc-auditd +++ b/usr/src/cmd/auditd/svc-auditd @@ -3,9 +3,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. @@ -21,7 +20,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. # # ident "%Z%%M% %I% %E% SMI" @@ -34,7 +33,6 @@ . /lib/svc/share/smf_include.sh AUDITCONFIG=/usr/sbin/auditconfig -ZONE=`/sbin/zonename` AUDITCOND=`$AUDITCONFIG -getcond 2> /dev/null` @@ -47,7 +45,7 @@ fi # In a non-global zone, auditd is started only if the "perzone" # audit policy has been set. -if [ "$ZONE" != "global" ]; then +if smf_is_nonglobalzone; then echo `$AUDITCONFIG -getpolicy` | grep perzone > /dev/null if [ $? -eq 1 ]; then |