diff options
| author | bmeeks8 <bmeeks8@bellsouth.net> | 2013-05-31 21:28:48 -0400 |
|---|---|---|
| committer | bmeeks8 <bmeeks8@bellsouth.net> | 2013-05-31 21:28:48 -0400 |
| commit | e126e8887597bf0b813309dd5597b18385223859 (patch) | |
| tree | f5df55c21715cc9e3437e3929e011f65a9f38b38 /config/postfix | |
| parent | 405cc6f84aa386a4451c38e953a8fa36664106e8 (diff) | |
| parent | dcccb98d5d9dfbf3f3e9a8a2272324dbc3e67ed8 (diff) | |
| download | pfsense-packages-e126e8887597bf0b813309dd5597b18385223859.tar.gz pfsense-packages-e126e8887597bf0b813309dd5597b18385223859.tar.bz2 pfsense-packages-e126e8887597bf0b813309dd5597b18385223859.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'config/postfix')
| -rwxr-xr-x[-rw-r--r--] | config/postfix/postfix.inc | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/config/postfix/postfix.inc b/config/postfix/postfix.inc index b564fd47..4378a1f9 100644..100755 --- a/config/postfix/postfix.inc +++ b/config/postfix/postfix.inc @@ -278,9 +278,10 @@ function check_cron(){ } -function sync_package_postfix($via_rpc=false) { +function sync_package_postfix($via_rpc="no") { global $config; + log_error("sync_package_postfix called with via_rpc={$via_rpc}"); # detect boot process if (is_array($_POST)){ if (preg_match("/\w+/",$_POST['__csrf_magic'])) @@ -289,7 +290,7 @@ function sync_package_postfix($via_rpc=false) { $boot_process="on"; } - if(is_process_running("master") && isset($boot_process) && $via_rpc==false) + if(is_process_running("master") && isset($boot_process) && $via_rpc=="no") return; #check patch in /etc/inc/config. @@ -731,7 +732,7 @@ MASTEREOF2; postfix_start(); #Do not sync during boot - if(!isset($boot_process)) + if(!isset($boot_process) || $via_rpc=="yes") postfix_sync_on_changes(); } @@ -944,7 +945,7 @@ function postfix_do_xmlrpc_sync($sync_to_ip,$username,$password,$sync_type,$sync /* tell postfix to reload our settings on the destionation sync host. */ $method = 'pfsense.exec_php'; $execcmd = "require_once('/usr/local/pkg/postfix.inc');\n"; - $execcmd .= "sync_package_postfix(true);"; + $execcmd .= "sync_package_postfix('yes');"; /* assemble xmlrpc payload */ $params = array( |