aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRenato Botelho <renato@netgate.com>2015-09-08 08:05:55 -0300
committerRenato Botelho <renato@netgate.com>2015-09-08 08:05:55 -0300
commitf1a7adf9da859b552baef92bcca88f0abde01ad0 (patch)
tree2218c11c986dee153cc9c621c8bb599e7bd04eaf
parent46d4da44f8da4cca4eee0e91382c8d2157d8afb1 (diff)
parent057cd703cd20ca5c9a786932bc4c25a8f7d40c88 (diff)
downloadpfsense-packages-f1a7adf9da859b552baef92bcca88f0abde01ad0.tar.gz
pfsense-packages-f1a7adf9da859b552baef92bcca88f0abde01ad0.tar.bz2
pfsense-packages-f1a7adf9da859b552baef92bcca88f0abde01ad0.zip
Merge pull request #1028 from doktornotor/patch-2
-rw-r--r--config/tinc/tinc.inc4
-rw-r--r--pkg_config.10.xml2
2 files changed, 3 insertions, 3 deletions
diff --git a/config/tinc/tinc.inc b/config/tinc/tinc.inc
index 65f07e32..81e506b4 100644
--- a/config/tinc/tinc.inc
+++ b/config/tinc/tinc.inc
@@ -159,8 +159,8 @@ function tinc_save() {
if ($tincconf['enable'] != "") {
restart_service("tinc");
- } elseif (is_process_running("tincd")); {
- stop_service("tinc");
+ } elseif (is_process_running("tincd")) {
+ stop_service("tinc");
}
rmdir_recursive("/usr/local/etc/tinc.old");
diff --git a/pkg_config.10.xml b/pkg_config.10.xml
index 8e7c95ba..9aad14ee 100644
--- a/pkg_config.10.xml
+++ b/pkg_config.10.xml
@@ -1477,7 +1477,7 @@
<build_pbi>
<port>security/tinc</port>
</build_pbi>
- <version>1.2.2</version>
+ <version>1.2.3</version>
<status>ALPHA</status>
<pkginfolink>https://doc.pfsense.org/index.php/tinc_package</pkginfolink>
<required_version>2.2</required_version>