From 432320ec546870b8bb746283456722fa7e3bf3d6 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sun, 30 May 2021 12:29:06 +0100 Subject: [PATCH] cmdlistener: Tidy up MC::SetSuperusr slightly Signed-off-by: Ian Jackson --- daemon/cmdlistener.rs | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/daemon/cmdlistener.rs b/daemon/cmdlistener.rs index 7395a695..959753c2 100644 --- a/daemon/cmdlistener.rs +++ b/daemon/cmdlistener.rs @@ -138,16 +138,17 @@ fn execute_and_respond(cs: &mut CommandStreamData, cmd: MgmtCommand, MC::Noop => Fine, MC::SetSuperuser(enable) => { - let euid = match &cs.authstate { + let preserve_euid = match &cs.authstate { AuthState::None { euid, .. } => euid, AuthState::Superuser { euid, .. } => euid, }.clone(); + if !enable { - cs.authstate = AuthState::None { euid }; + cs.authstate = AuthState::None { euid: preserve_euid }; } else { let auth = authorise_scope_direct(cs, &AccountScope::Server)?; let auth = auth.therefore_ok(); - cs.authstate = AuthState::Superuser { euid, auth }; + cs.authstate = AuthState::Superuser { euid: preserve_euid, auth }; } Fine }, -- 2.30.2