From 158514a8362ac7ffdecd1562fc2be6b8e113718c Mon Sep 17 00:00:00 2001 From: =?utf8?q?Fabian=20Gr=C3=BCnbichler?= Date: Mon, 11 Nov 2019 11:28:08 +0100 Subject: [PATCH] use PVE::DataCenterConfig MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit since we read datacenter.cfg, and parse the u2f property string using a format defined in PVE::DataCenterConfig. Signed-off-by: Fabian Grünbichler --- PVE/API2/AccessControl.pm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/PVE/API2/AccessControl.pm b/PVE/API2/AccessControl.pm index b3fbe6d..a4b9fa3 100644 --- a/PVE/API2/AccessControl.pm +++ b/PVE/API2/AccessControl.pm @@ -10,6 +10,7 @@ use PVE::Exception qw(raise raise_perm_exc raise_param_exc); use PVE::SafeSyslog; use PVE::RPCEnvironment; use PVE::Cluster qw(cfs_read_file); +use PVE::DataCenterConfig; use PVE::RESTHandler; use PVE::AccessControl; use PVE::JSONSchema qw(get_standard_option); @@ -389,7 +390,7 @@ sub get_u2f_config() { my $dc = cfs_read_file('datacenter.cfg'); my $u2f = $dc->{u2f}; die "u2f not configured in datacenter.cfg\n" if !$u2f; - $u2f = PVE::JSONSchema::parse_property_string($PVE::Cluster::u2f_format, $u2f); + $u2f = PVE::JSONSchema::parse_property_string($PVE::DataCenterConfig::u2f_format, $u2f); return $u2f; } -- 2.39.5