diff options
author | Ermal <eri@pfsense.org> | 2013-06-17 07:54:33 +0000 |
---|---|---|
committer | Ermal <eri@pfsense.org> | 2013-06-17 07:54:33 +0000 |
commit | 1944af41528af2ceb2bf2b053322f1aba932e014 (patch) | |
tree | 200ffe14d7649db8e6c551115d5088eacf7a06b1 | |
parent | 12f77b03360180d175f717d182406fa37632f87e (diff) | |
download | pfsense-1944af41528af2ceb2bf2b053322f1aba932e014.zip pfsense-1944af41528af2ceb2bf2b053322f1aba932e014.tar.gz |
Remove unreferenced binaries. correct some formatting and also to make function clear to track correct the curly placement
-rw-r--r-- | etc/inc/services.inc | 30 |
1 files changed, 14 insertions, 16 deletions
diff --git a/etc/inc/services.inc b/etc/inc/services.inc index 23026bd..c61ea54 100644 --- a/etc/inc/services.inc +++ b/etc/inc/services.inc @@ -32,10 +32,9 @@ /* pfSense_BUILDER_BINARIES: /usr/bin/killall /bin/pgrep /bin/sh /usr/local/sbin/dhcpd /usr/local/sbin/igmpproxy - pfSense_BUILDER_BINARIES: /sbin/ifconfig /usr/sbin/arp /sbin/ifconfig /usr/local/sbin/dnsmasq - pfSense_BUILDER_BINARIES: /usr/sbin/bsnmpd /sbin/route + pfSense_BUILDER_BINARIES: /sbin/ifconfig /usr/local/sbin/dnsmasq pfSense_BUILDER_BINARIES: /usr/local/sbin/miniupnpd /usr/sbin/radvd - pfSense_BUILDER_BINARIES: /usr/local/sbin/dhcleases6 + pfSense_BUILDER_BINARIES: /usr/local/sbin/dhcleases6 /usr/sbin/bsnmpd pfSense_MODULE: utils */ @@ -346,8 +345,6 @@ function services_dhcpdv4_configure() { /* kill any running dhcpd */ if (isvalidpid("{$g['dhcpd_chroot_path']}{$g['varrun_path']}/dhcpd.pid")) killbypid("{$g['dhcpd_chroot_path']}{$g['varrun_path']}/dhcpd.pid"); - else - mwexec("/usr/bin/killall dhcpd", true); /* DHCP enabled on any interfaces? */ if (!is_dhcp_server_enabled()) @@ -1037,9 +1034,10 @@ EOD; $ifcfgsnv6 = get_interface_subnetv6($dhcpv6if); $subnetv6 = gen_subnetv6($ifcfgipv6, $ifcfgsnv6); - if($is_olsr_enabled == true) + if ($is_olsr_enabled == true) { if($dhcpv6ifconf['netmask']) $subnetmask = gen_subnet_maskv6($dhcpv6ifconf['netmask']); + } $dnscfgv6 = ""; @@ -1047,7 +1045,7 @@ EOD; $dnscfgv6 .= " option domain-name \"{$dhcpv6ifconf['domain']}\";\n"; } - if($dhcpv6ifconf['domainsearchlist'] <> "") { + if ($dhcpv6ifconf['domainsearchlist'] <> "") { $dnscfgv6 .= " option domain-search \"" . join("\",\"", preg_split("/[ ;]+/", $dhcpv6ifconf['domainsearchlist'])) . "\";\n"; } @@ -1065,7 +1063,7 @@ EOD; } else if (is_array($syscfg['dnsserver']) && ($syscfg['dnsserver'][0])) { $dns_arrv6 = array(); foreach($syscfg['dnsserver'] as $dnsserver) { - if(is_ipaddrv6($dnsserver)) { + if (is_ipaddrv6($dnsserver)) { $dns_arrv6[] = $dnsserver; } } @@ -1073,12 +1071,13 @@ EOD; $dnscfgv6 .= " option dhcp6.name-servers " . join(",", $dns_arrv6) . ";"; } - if(is_ipaddrv6($ifcfgipv6)) { - $dhcpdv6conf .= "subnet6 {$subnetv6}/{$ifcfgsnv6} {\n"; + if (is_ipaddrv6($ifcfgipv6)) { + $dhcpdv6conf .= "subnet6 {$subnetv6}/{$ifcfgsnv6}"; } else { $subnet6 = gen_subnetv6($dhcpv6ifconf['range']['from'], "64"); - $dhcpdv6conf .= "subnet6 {$subnet6}/64 {\n"; + $dhcpdv6conf .= "subnet6 {$subnet6}/64"; } + $dhcpdv6conf .= " {\n"; if($dhcpv6ifconf['failover_peerip'] <> "") $dhcpdv6conf .= " deny dynamic bootp clients;\n"; @@ -1092,9 +1091,8 @@ $dnscfgv6 EOD; - if(is_ipaddrv6($dhcpv6ifconf['prefixrange']['from']) && is_ipaddrv6($dhcpv6ifconf['prefixrange']['to'])) { + if (is_ipaddrv6($dhcpv6ifconf['prefixrange']['from']) && is_ipaddrv6($dhcpv6ifconf['prefixrange']['to'])) { $dhcpdv6conf .= " prefix6 {$dhcpv6ifconf['prefixrange']['from']} {$dhcpv6ifconf['prefixrange']['to']}/{$dhcpv6ifconf['prefixrange']['prefixlength']};\n"; - } // default-lease-time if ($dhcpv6ifconf['defaultleasetime']) @@ -1122,7 +1120,7 @@ EOD; // Handle option, number rowhelper values $dhcpdv6conf .= "\n"; - if($dhcpv6ifconf['numberoptions']['item']) { + if ($dhcpv6ifconf['numberoptions']['item']) { foreach($dhcpv6ifconf['numberoptions']['item'] as $itemv6idx => $itemv6) { $dhcpdv6conf .= " option custom-{$dhcpv6if}-{$itemv6idx} \"{$itemv6['value']}\";\n"; } @@ -1176,12 +1174,12 @@ EOD; } } - if($config['dhcpdv6'][$dhcpv6if]['ramode'] <> "unmanaged") { + if ($config['dhcpdv6'][$dhcpv6if]['ramode'] <> "unmanaged") { if(preg_match("/poes/si", $dhcpv6if)) { /* magic here */ $dhcpdv6ifs = array_merge($dhcpdv6ifs, get_pppoes_child_interfaces($dhcpv6if)); } else { - $realif = get_real_interface($dhcpv6if); + $realif = get_real_interface($dhcpv6if, "inet6"); if (stristr("$realif", "bridge")) { $mac = get_interface_mac($realif); $v6address = generate_ipv6_from_mac($mac); |