From b66ff4bc5b54be81a09ffb84a9b82618e6402564 Mon Sep 17 00:00:00 2001 From: Franco Fichtner Date: Tue, 19 Jul 2022 08:14:28 +0200 Subject: [PATCH] interfaces: fix expire dhcp6c regex further According to the manual "forever" is actually the correct keyword. Also the double-pipe was senseless matching an empty expression and there was a dash missing between month and day. --- src/etc/inc/interfaces.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/etc/inc/interfaces.inc b/src/etc/inc/interfaces.inc index 8f60d2dd8..68477c81c 100644 --- a/src/etc/inc/interfaces.inc +++ b/src/etc/inc/interfaces.inc @@ -3072,7 +3072,7 @@ function DHCP6_Config_File_Advanced($interface, $wancfg, $wanif, $id = 0) $key_info_statement .= " realm \"{$wancfg['adv_dhcp6_key_info_statement_realm']}\";\n"; $key_info_statement .= " keyid {$wancfg['adv_dhcp6_key_info_statement_keyid']};\n"; $key_info_statement .= " secret \"{$wancfg['adv_dhcp6_key_info_statement_secret']}\";\n"; - if (preg_match("/((([0-9]{4}-)?[0-9]{2}[0-9]{2} )?[0-9]{2}:[0-9]{2})||(forever)/", $wancfg['adv_dhcp6_key_info_statement_expire'])) { + if (preg_match("/((([0-9]{4}-)?[0-9]{2}-[0-9]{2} )?[0-9]{2}:[0-9]{2})|(forever)/", $wancfg['adv_dhcp6_key_info_statement_expire'])) { $key_info_statement .= " expire \"{$wancfg['adv_dhcp6_key_info_statement_expire']}\";\n"; } $key_info_statement .= "};\n";