aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormcrane <mctch@yahoo.com>2009-08-03 22:01:10 -0600
committermcrane <mctch@yahoo.com>2009-08-03 22:01:10 -0600
commit477fbe3dfbe31d5e96766f730f1fa48ccd1b7387 (patch)
tree2621be5845a901c4918c1a8e5654bc97e5fe4bc8
parent643260fe97c663d7205951c8159601a7b3cc4d6c (diff)
downloadpfsense-packages-477fbe3dfbe31d5e96766f730f1fa48ccd1b7387.tar.gz
pfsense-packages-477fbe3dfbe31d5e96766f730f1fa48ccd1b7387.tar.bz2
pfsense-packages-477fbe3dfbe31d5e96766f730f1fa48ccd1b7387.zip
Denyhosts package restore original hosts.allow file when the package is uninstalled.
-rw-r--r--config/denyhosts/denyhosts.inc29
-rw-r--r--config/denyhosts/denyhosts.xml2
-rwxr-xr-xpkg_config.7.xml2
3 files changed, 21 insertions, 12 deletions
diff --git a/config/denyhosts/denyhosts.inc b/config/denyhosts/denyhosts.inc
index 75d6400e..e1bcf877 100644
--- a/config/denyhosts/denyhosts.inc
+++ b/config/denyhosts/denyhosts.inc
@@ -71,6 +71,8 @@ function php_install_command()
unlink_if_exists("/tmp/edit_area.tgz");
}
+ //backup the original hosts.allow file
+ exec ("cp /etc/hosts.allow /etc/hosts.allow.bak");
$hosts_allow = "#\n";
$hosts_allow .= "# hosts.allow access control file for \"tcp wrapped\" applications.\n";
@@ -173,19 +175,26 @@ function deinstall_command()
conf_mount_rw();
config_lock();
-
- $hosts_allow = "#\n";
- $hosts_allow .= "# hosts.allow access control file for \"tcp wrapped\" applications.\n";
- $hosts_allow .= "#\n";
- $hosts_allow .= "ALL : ALL : allow\n";
- $fout = fopen("/etc/hosts.allow","w");
- fwrite($fout, $tmp);
- unset($tmp);
- fclose($fout);
-
+
exec("pkg_delete denyhosts");
exec("rm -R /usr/local/www/packages/denyhosts/");
+ //restore original hosts.allow file
+ if (file_exists('/usr/local/www/exec.php')) {
+ exec ("rm /etc/hosts.allow");
+ exec ("cp /etc/hosts.allow.bak /etc/hosts.allow");
+ }
+
+ //create a new hosts.allow file
+ //$hosts_allow = "#\n";
+ //$hosts_allow .= "# hosts.allow access control file for \"tcp wrapped\" applications.\n";
+ //$hosts_allow .= "#\n";
+ //$hosts_allow .= "ALL : ALL : allow\n";
+ //$fout = fopen("/etc/hosts.allow","w");
+ //fwrite($fout, $tmp);
+ //unset($tmp);
+ //fclose($fout);
+
conf_mount_ro();
config_unlock();
}
diff --git a/config/denyhosts/denyhosts.xml b/config/denyhosts/denyhosts.xml
index 4d0799ee..a3f28bc5 100644
--- a/config/denyhosts/denyhosts.xml
+++ b/config/denyhosts/denyhosts.xml
@@ -41,7 +41,7 @@
<requirements>Describe your package requirements here</requirements>
<faq>Currently there are no FAQ items provided.</faq>
<name>DenyHosts</name>
- <version>0.4</version>
+ <version>0.5</version>
<title>Settings</title>
<include_file>/usr/local/pkg/denyhosts.inc</include_file>
<menu>
diff --git a/pkg_config.7.xml b/pkg_config.7.xml
index d7f28859..dadd0238 100755
--- a/pkg_config.7.xml
+++ b/pkg_config.7.xml
@@ -224,7 +224,7 @@
<pkginfolink></pkginfolink>
<config_file>http://www.pfsense.com/packages/config/denyhosts/denyhosts.xml</config_file>
<depends_on_package_base_url>http://files.pfsense.org/packages/7/All/</depends_on_package_base_url>
- <version>0.4</version>
+ <version>0.5</version>
<status>Beta</status>
<required_version>1.2.3</required_version>
<maintainer>markjcrane@gmail.com</maintainer>