diff options
| author | Ermal <eri@pfsense.org> | 2011-08-03 19:57:10 +0000 |
|---|---|---|
| committer | Ermal <eri@pfsense.org> | 2011-08-03 19:57:10 +0000 |
| commit | 6d7a47aeac855ffac2b9c2fbbc0e6b75908da8a1 (patch) | |
| tree | 30f82b55b338572f82619d645074670c9eeb7d82 /config/snort | |
| parent | a0d4ad5e3fd35a5578b1fb38f671e463b379a506 (diff) | |
| download | pfsense-packages-6d7a47aeac855ffac2b9c2fbbc0e6b75908da8a1.tar.gz pfsense-packages-6d7a47aeac855ffac2b9c2fbbc0e6b75908da8a1.tar.bz2 pfsense-packages-6d7a47aeac855ffac2b9c2fbbc0e6b75908da8a1.zip | |
Remove some code that might be problematic and causing issues for the package during install/deinstall process
Diffstat (limited to 'config/snort')
| -rw-r--r-- | config/snort/snort.inc | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/config/snort/snort.inc b/config/snort/snort.inc index 280a1022..f6c49ffd 100644 --- a/config/snort/snort.inc +++ b/config/snort/snort.inc @@ -628,10 +628,6 @@ function snort_postinstall() chdir('/root/'); } - /* make sure snort-old is deinstalled */ - unset($config['installedpackages']['snortdefservers'], $config['installedpackages']['snortwhitelist']); - unset($config['installedpackages']['snortthreshold'], $config['installedpackages']['snortadvanced']); - /* remake saved settings */ if ($config['installedpackages']['snortglobal']['forcekeepsettings'] == 'on') { update_status(gettext("Saved settings detected...")); @@ -1585,9 +1581,9 @@ function snort_deinstall() { mwexec('/usr/bin/killall -9 barnyard2', true); sleep(2); mwexec('/usr/sbin/pw userdel snort; /usr/sbin/pw groupdel snort', true); - mwexec('/bin/rm -rf /usr/local/etc/snort*; /bin/rm -rf /usr/local/pkg/snort*; /bin/rm -rf /usr/local/pkg/pf/snort*', true); + mwexec('/bin/rm -rf /usr/local/etc/snort*; /bin/rm -rf /usr/local/pkg/snort*', true); mwexec('/bin/rm -r /usr/local/bin/barnyard2', true); - mwexec('/bin/rm -rf /usr/local/www/snort; /bin/rm -rf /usr/local/lib/snort; /bin/rm -rf /var/log/snort; /bin/rm -rf /usr/local/pkg/snort, true'); + mwexec('/bin/rm -rf /usr/local/www/snort; /bin/rm -rf /var/log/snort', true); /* Remove snort cron entries Ugly code needs smoothness*/ if (!function_exists('snort_deinstall_cron')) { |