summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--usr/src/cmd/cmd-inet/usr.sbin/routeadm/svc-forwarding4
-rw-r--r--usr/src/cmd/vntsd/svc-vntsd8
-rw-r--r--usr/src/uts/sun4/os/cpu_states.c8
3 files changed, 10 insertions, 10 deletions
diff --git a/usr/src/cmd/cmd-inet/usr.sbin/routeadm/svc-forwarding b/usr/src/cmd/cmd-inet/usr.sbin/routeadm/svc-forwarding
index 48f77f98e1..b0c94b9acd 100644
--- a/usr/src/cmd/cmd-inet/usr.sbin/routeadm/svc-forwarding
+++ b/usr/src/cmd/cmd-inet/usr.sbin/routeadm/svc-forwarding
@@ -40,7 +40,7 @@ proto="$2"
if [ -z "$proto" ]; then
usage
- exit $SMF_ERROR_FATAL
+ exit $SMF_EXIT_ERROR_FATAL
fi
case "$1" in
@@ -65,7 +65,7 @@ case "$1" in
;;
*)
usage
- exit $SMF_ERROR_FATAL
+ exit $SMF_EXIT_ERROR_FATAL
;;
esac
diff --git a/usr/src/cmd/vntsd/svc-vntsd b/usr/src/cmd/vntsd/svc-vntsd
index 988fa2d6c3..3bea6c0274 100644
--- a/usr/src/cmd/vntsd/svc-vntsd
+++ b/usr/src/cmd/vntsd/svc-vntsd
@@ -87,9 +87,9 @@ add_user_entries()
w
q
EOF
- else
+ else
#
- # Add a root entry with vntsd attribute.
+ # Add a root entry with vntsd attribute.
#
$CAT >>${USER_ATTR} << EOF
# Added by svc-vntsd
@@ -155,9 +155,9 @@ if [ -x /usr/lib/ldoms/vntsd ]; then
# if vntsd exited in error with status 1, let SMF restart it
# otherwise we want it to go into maintenance.
if [ $rc -eq 1 ]; then
- exit $SMF_ERR_OTHER
+ exit $rc
else
- exit $SMF_ERR_FATAL
+ exit $SMF_EXIT_ERR_FATAL
fi
fi
else
diff --git a/usr/src/uts/sun4/os/cpu_states.c b/usr/src/uts/sun4/os/cpu_states.c
index 5c53df1182..44640b68af 100644
--- a/usr/src/uts/sun4/os/cpu_states.c
+++ b/usr/src/uts/sun4/os/cpu_states.c
@@ -185,11 +185,11 @@ abort_sequence_enter(char *msg)
*/
abort_seq_tstamp = 0LL;
mutex_exit(&abort_seq_lock);
- if (!on_intr && auditing)
- audit_enterprom(1);
+ if (!on_intr && auditing)
+ audit_enterprom(1);
(*abort_seq_handler)(msg);
- if (!on_intr && auditing)
- audit_exitprom(1);
+ if (!on_intr && auditing)
+ audit_exitprom(1);
}
} else {
if (auditing)