Project

General

Profile

« Previous | Next » 

Revision a6e1c192

Added by Viktor Gurov almost 5 years ago

Save OMAPI settings in dhcpd.conf. Issue #10270

View differences:

src/etc/inc/services.inc
559 559

  
560 560
EOD;
561 561

  
562
	if (!isset($dhcpifconf['disableauthoritative'])) {
563
		$dhcpdconf .= "authoritative;\n";
564
	}
562
	/* take these settings from the first DHCP configured interface,
563
	 * see https://redmine.pfsense.org/issues/10270 
564
	 * TODO: Global Settings tab, see https://redmine.pfsense.org/issues/5080 */
565
	foreach ($dhcpdcfg as $dhcpif => $dhcpifconf) {
566
		if (!isset($dhcpifconf['disableauthoritative'])) {
567
			$dhcpdconf .= "authoritative;\n";
568
		}
565 569

  
566
	if (isset($dhcpifconf['alwaysbroadcast'])) {
567
		$dhcpdconf .= "always-broadcast on\n";
568
	}
570
		if (isset($dhcpifconf['alwaysbroadcast'])) {
571
			$dhcpdconf .= "always-broadcast on\n";
572
		}
569 573

  
570
	// OMAPI Settings
571
	if (isset($dhcpifconf['omapi_port']) && is_numeric($dhcpifconf['omapi_port'])) {
572
		$dhcpdconf .= <<<EOD
574
		// OMAPI Settings
575
		if (isset($dhcpifconf['omapi_port']) && is_numeric($dhcpifconf['omapi_port'])) {
576
			$dhcpdconf .= <<<EOD
573 577

  
574 578
key omapi_key {
575 579
  algorithm {$dhcpifconf['omapi_key_algorithm']};
......
579 583
omapi-key omapi_key;
580 584

  
581 585
EOD;
586

  
587
		}
588
		break;
582 589
	}
583 590

  
584 591
	$dhcpdifs = array();
src/usr/local/www/services_dhcp.php
1152 1152
	'text',
1153 1153
	$pconfig['omapi_port']
1154 1154
))->setAttribute('placeholder', 'OMAPI Port')
1155
  ->setHelp('Set the port that OMAPI will listen on. The default port is 7911, leave blank to disable.');
1155
  ->setHelp('Set the port that OMAPI will listen on. The default port is 7911, leave blank to disable.' .
1156
	    'Only the first OMAPI configuration is used.');
1156 1157

  
1157 1158
$group = new Form_Group('OMAPI Key');
1158 1159

  

Also available in: Unified diff