diff options
| author | Renato Botelho <renato@netgate.com> | 2015-08-11 11:53:10 -0300 |
|---|---|---|
| committer | Renato Botelho <renato@netgate.com> | 2015-08-11 11:53:10 -0300 |
| commit | 3faf4d8c63981742cf7d6a99c41c9e39d815db0d (patch) | |
| tree | 655166f28159c9630a5c13e078f7aa54411cd6c7 /config/spamd/spamd.inc | |
| parent | c0ab8887bdfff3064351e598840bdce35a174fbd (diff) | |
| parent | 0767305b6d3ba9725d138d6cd8d65fe610e85201 (diff) | |
| download | pfsense-packages-3faf4d8c63981742cf7d6a99c41c9e39d815db0d.tar.gz pfsense-packages-3faf4d8c63981742cf7d6a99c41c9e39d815db0d.tar.bz2 pfsense-packages-3faf4d8c63981742cf7d6a99c41c9e39d815db0d.zip | |
Merge pull request #989 from doktornotor/patch-2
Diffstat (limited to 'config/spamd/spamd.inc')
| -rw-r--r-- | config/spamd/spamd.inc | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/config/spamd/spamd.inc b/config/spamd/spamd.inc index 71f20106..bbfae23e 100644 --- a/config/spamd/spamd.inc +++ b/config/spamd/spamd.inc @@ -43,7 +43,6 @@ function sync_package_spamd() { } conf_mount_rw(); - config_lock(); $fd = fopen("/etc/spamd.conf","w"); /* all header */ fwrite($fd, "all:\\\n\t:whitelist:blacklist"); @@ -155,8 +154,6 @@ function sync_package_spamd() { spamd_install_cron(true); log_error("Mounting RO"); conf_mount_ro(); - log_error("Unlocking config"); - config_unlock(); log_error("Restart cron"); mwexec("killall -HUP cron"); log_error("Setting up spamd.conf symlink"); @@ -176,7 +173,6 @@ function sync_package_spamd() { function sync_package_spamd_whitelist() { global $config; conf_mount_rw(); - config_lock(); /* write out ip to the whitelist db */ $fd = fopen("/var/db/whitelist.txt","w"); if($config['installedpackages']['spamdwhitelist']['config'] != "") { @@ -189,7 +185,6 @@ function sync_package_spamd_whitelist() { mwexec("/usr/bin/killall -HUP spamlogd"); mwexec("/sbin/pfctl -t spamd-white -T add {$spamd['ip']}"); conf_mount_ro(); - config_unlock(); } function spamd_generate_rules($type) { |