diff options
| author | Scott Ullrich <sullrich@pfsense.org> | 2005-11-27 20:41:10 +0000 |
|---|---|---|
| committer | Scott Ullrich <sullrich@pfsense.org> | 2005-11-27 20:41:10 +0000 |
| commit | d7a6517a4bf23188d37dfa60d9314437275d6343 (patch) | |
| tree | 74b2c5926940b32e0da46b470129aa4b1da357a0 /etc/inc/util.inc | |
| parent | 528df9a78e17a9c7acfddff1e3c50696e3a24228 (diff) | |
| download | pfsense-d7a6517a4bf23188d37dfa60d9314437275d6343.zip pfsense-d7a6517a4bf23188d37dfa60d9314437275d6343.tar.gz | |
MFC 8080
* Do not process hotplug events from pppoe
* Cleanup kill by pid function, accept a real pid (dhclient depends on this)
Diffstat (limited to 'etc/inc/util.inc')
| -rw-r--r-- | etc/inc/util.inc | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/etc/inc/util.inc b/etc/inc/util.inc index cea6998..2502c56 100644 --- a/etc/inc/util.inc +++ b/etc/inc/util.inc @@ -37,7 +37,10 @@ function killbypid($pidfile) { /* sigkill a process by pid file */ function sigkillbypid($pidfile, $sig) { if (file_exists($pidfile)) { - mwexec("/bin/kill -s $sig `/bin/cat " . $pidfile . "`"); + $pid = file_get_contents($pidfile); + mwexec("/bin/kill -s $sig {$pid}"); + } else { + mwexec("/bin/kill -s $sig {$pidfile}"); } } @@ -487,4 +490,4 @@ function xml_safe_fieldname($fieldname) { return strtolower(str_replace($replace, "", $fieldname)); } -?> +?>
\ No newline at end of file |
