Project

General

Profile

« Previous | Next » 

Revision 887f2517

Added by Ermal Luçi over 10 years ago

Merge manually pull request #1593

View differences:

etc/inc/vpn.inc
575 575

  
576 576
	$uniqueids = 'yes';
577 577
	if (!empty($config['ipsec']['uniqueids'])) {
578
		if (in_array($uniqueids, $ipsec_idhandling))
578
		if (array_key_exists($config['ipsec']['uniqueids'], $ipsec_idhandling)) {
579 579
			$uniqueids = $config['ipsec']['uniqueids'];
580
		}
580 581
	}
581 582
	$natfilterrules = false;
582 583
	/* begin ipsec.conf */
usr/local/www/vpn_ipsec_settings.php
51 51
$pconfig['acceptunencryptedmainmode'] = isset($config['ipsec']['acceptunencryptedmainmode']);
52 52
$pconfig['maxmss_enable'] = isset($config['system']['maxmss_enable']);
53 53
$pconfig['maxmss'] = $config['system']['maxmss'];
54
$pconfig['uniqueids'] = $config['ipsec']['uniqueids'];
54 55

  
55 56
if ($_POST) {
56 57

  

Also available in: Unified diff