From 0b291a37cfe3ac90ee32063ac302e70add558127 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tam=C3=A1s=20G=C3=A9rczei?= <tamas@gerczei.eu>
Date: Tue, 19 Apr 2016 10:44:11 +0200
Subject: [PATCH] fixed broken method script plus removed property
 'config/delay' since SMF does not do token expansion anywhere outside 'exec'

---
 guesthandler.xml | 3 +--
 svc-guesthandler | 7 ++-----
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/guesthandler.xml b/guesthandler.xml
index b03e013..1d0230b 100644
--- a/guesthandler.xml
+++ b/guesthandler.xml
@@ -10,7 +10,7 @@
     <exec_method name='start' type='method' exec='%{config/method_prefix}/svc-guesthandler %m' timeout_seconds='0'>
       <method_context>
         <method_environment>
-          <envvar name='DELAY' value='%{config/delay}'/>
+          <envvar name='DELAY' value='30'/>
         </method_environment>
       </method_context>
     </exec_method>
@@ -19,7 +19,6 @@
       <propval name='duration' type='astring' value='transient'/>
     </property_group>
     <property_group name='config' type='eu.gerczei,guesthandler_configuration'>
-      <propval name='delay' type='integer' value='30'/>
       <propval name='method_prefix' type='astring' value='/opt/custom/bin'/>
     </property_group>
     <stability value='Unstable'/>
diff --git a/svc-guesthandler b/svc-guesthandler
index 5538265..53ba840 100644
--- a/svc-guesthandler
+++ b/svc-guesthandler
@@ -73,11 +73,8 @@ case $1 in
 	;;
 
 	*)
-		if smf_present;
-			then
-				exit $SMF_EXIT_ERR_CONFIG;
-			else
-				print
+		exit $SMF_EXIT_ERR_CONFIG
+	;;
 esac
 
 exit $SMF_EXIT_NODAEMON