public inbox for pve-devel@lists.proxmox.com
 help / color / mirror / Atom feed
From: Wolfgang Bumiller <w.bumiller@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH access-control 1/2] fix a 'use of undefined...' warning
Date: Mon,  6 Dec 2021 09:38:00 +0100	[thread overview]
Message-ID: <20211206083801.18134-1-w.bumiller@proxmox.com> (raw)

Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
---
 src/PVE/AccessControl.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/PVE/AccessControl.pm b/src/PVE/AccessControl.pm
index 168fc26..51a96a3 100644
--- a/src/PVE/AccessControl.pm
+++ b/src/PVE/AccessControl.pm
@@ -781,9 +781,9 @@ sub authenticate_2nd_new : prototype($$$$) {
 	}
 
 	my $realm_type = $realm_tfa && $realm_tfa->{type};
-	$realm_type = 'totp' if $realm_type eq 'oath'; # we used to call it that
 	# verify realm type unless using recovery keys:
 	if (defined($realm_type)) {
+	    $realm_type = 'totp' if $realm_type eq 'oath'; # we used to call it that
 	    if ($realm_type eq 'yubico') {
 		# Yubico auth will not be supported in rust for now...
 		if (!defined($tfa_challenge)) {
-- 
2.30.2





             reply	other threads:[~2021-12-06  8:38 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-12-06  8:38 Wolfgang Bumiller [this message]
2021-12-06  8:38 ` [pve-devel] [PATCH access-control 2/2] fix #3768: warn on bad u2f or webauthn settings Wolfgang Bumiller
2021-12-06 12:56   ` [pve-devel] applied: " Thomas Lamprecht
2021-12-06 12:56 ` [pve-devel] applied: [PATCH access-control 1/2] fix a 'use of undefined...' warning Thomas Lamprecht

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20211206083801.18134-1-w.bumiller@proxmox.com \
    --to=w.bumiller@proxmox.com \
    --cc=pve-devel@lists.proxmox.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal