- fix "service tincd status" for multiple instances

PR:		245095
Submitted by:	errit@weinberg2.de

2 files changed, 25 insertions, 1 deletions

diff --git a/security/tinc-devel/Makefile b/security/tinc-devel/Makefile
index 37fa08fce688..412f7d2769c2 100644
--- a/security/tinc-devel/Makefile
+++ b/security/tinc-devel/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	tinc
 PORTVERSION=	1.1pre17
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	security net-vpn
 MASTER_SITES=	https://www.tinc-vpn.org/packages/ \
 		http://www.tinc-vpn.org/packages/
diff --git a/security/tinc-devel/files/tincd.in b/security/tinc-devel/files/tincd.in
index e79b688d8f91..e6ffff60a737 100644
--- a/security/tinc-devel/files/tincd.in
+++ b/security/tinc-devel/files/tincd.in
@@ -30,6 +30,7 @@ command="%%PREFIX%%/sbin/tinc"
 start_cmd="tincd_start"
 stop_cmd="tincd_stop"
 reload_cmd="tincd_reload"
+status_cmd="tincd_status"
 extra_commands="reload"
 procname=${command:-tincd}
 ldconfig_command="/sbin/ldconfig"
@@ -85,6 +86,29 @@ tincd_reload()
 		done
 	fi
 }
+tincd_status_network() {
+	if [ -n "$rc_pid" ]; then
+		echo "${name} for ${cfg} is running as pid $rc_pid."
+	else
+		echo "${name} for ${cfg} is not running."
+		return 1
+	fi
+}
+tincd_status()
+{
+	if test -z "${tincd_cfg}"
+	then
+		cfg="."
+		rc_pid=$($command pid)
+		tincd_status_network
+	else
+		for cfg in $tincd_cfg
+		do
+			rc_pid=$($command -n $cfg pid)
+			tincd_status_network
+		done
+	fi
+}
 
 run_rc_command "$1"
 # eof