diff options
| author | timdufrane <tim.dufrane@gmail.com> | 2013-08-16 14:13:38 -0400 |
|---|---|---|
| committer | timdufrane <tim.dufrane@gmail.com> | 2013-08-16 14:13:38 -0400 |
| commit | af0cf104b57482d767d8dc3745a0cf9751e998f6 (patch) | |
| tree | 32f0b0c215101c77b6d61af3a0bc233c81786d6e | |
| parent | a6241f27938f2c09470d43c9a151a334f9923222 (diff) | |
| download | pfsense-packages-af0cf104b57482d767d8dc3745a0cf9751e998f6.tar.gz pfsense-packages-af0cf104b57482d767d8dc3745a0cf9751e998f6.tar.bz2 pfsense-packages-af0cf104b57482d767d8dc3745a0cf9751e998f6.zip | |
Contentscanners preg_replace
This condition also applies to the contentscanner section, and there is no variable substitution going on. Does not affect installs that use /usr/local, and allows the correct behavior on installs in /usr/pbi/dansguardian/... or wherever else (as long as DANSGUARDIAN_DIR is the correct directory).
| -rwxr-xr-x | config/dansguardian/dansguardian.inc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/config/dansguardian/dansguardian.inc b/config/dansguardian/dansguardian.inc index d4cd94bd..12c2af93 100755 --- a/config/dansguardian/dansguardian.inc +++ b/config/dansguardian/dansguardian.inc @@ -321,7 +321,7 @@ function sync_package_dansguardian($via_rpc="no",$install_process=false) { #contentscanners preg_replace patterns $match[0]="/(conf)/"; - $match[1]="/(\/usr.local)/"; + $match[1]="/\/usr.local|".str_replace("/","\\/",DANSGUARDIAN_DIR)."/"; $match[2]="/,/"; $replace[0]="$1'"; $replace[1]="contentscanner = '".DANSGUARDIAN_DIR; |