diff options
| author | Ermal <eri@pfsense.org> | 2010-10-12 22:12:18 +0000 |
|---|---|---|
| committer | Ermal <eri@pfsense.org> | 2010-10-12 22:12:18 +0000 |
| commit | 24997966586260e43763ab380aef414f16b88212 (patch) | |
| tree | 429480286e0f9c582edacf838e586725f176782d | |
| parent | df2a0f1861be7a4b751bc4cb6e5fe7025b8f0f9c (diff) | |
| download | pfsense-24997966586260e43763ab380aef414f16b88212.zip pfsense-24997966586260e43763ab380aef414f16b88212.tar.gz | |
Ticket #942. Try to prevent empty entries and use implode to avoid problems.
| -rw-r--r-- | etc/inc/services.inc | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/etc/inc/services.inc b/etc/inc/services.inc index 9ca1166..ff5409d 100644 --- a/etc/inc/services.inc +++ b/etc/inc/services.inc @@ -565,12 +565,18 @@ function services_dhcrelay_configure() { $destif = get_real_interface("wan"); } - $dhcrelayifs[] = $destif; + if (!empty($destif)) + $dhcrelayifs[] = $destif; } $dhcrelayifs = array_unique($dhcrelayifs); /* fire up dhcrelay */ - $cmd = "/usr/local/sbin/dhcrelay -i " . join(" -i ", $dhcrelayifs); + if (empty($dhcrelayifs)) { + log_error("No suitable interface found for running dhclreay!"); + return; /* XXX */ + } + + $cmd = "/usr/local/sbin/dhcrelay -i " . implode(" -i ", $dhcrelayifs); if (isset($dhcrelaycfg['agentoption'])) $cmd .= " -a -m replace"; |
