chiark
/
gitweb
/
~ianmdlvl
/
otter.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
89c0e8c
)
cmdlistener: Make space AuthState::Ssh variant
author
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Sat, 29 May 2021 21:56:35 +0000
(22:56 +0100)
committer
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Sun, 30 May 2021 13:13:57 +0000
(14:13 +0100)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
daemon/cmdlistener.rs
patch
|
blob
|
history
diff --git
a/daemon/cmdlistener.rs
b/daemon/cmdlistener.rs
index 377dda9427cfaa935d3f7e2f065d0fceb08a4ca4..e7a712ef65eed8c2845df8424d7bc92dbf976dc4 100644
(file)
--- a/
daemon/cmdlistener.rs
+++ b/
daemon/cmdlistener.rs
@@
-1730,7
+1730,10
@@
fn authorise_scope_direct(cs: &CommandStreamData, ag: &AccountsGuard,
fn do_authorise_scope(cs: &CommandStreamData, _ag: &AccountsGuard,
wanted: &AccountScope)
-> Authorisation<AccountScope> {
- if let Some(y) = cs.is_superuser() { return y }
+ match &cs.authstate {
+ &AuthState::Superuser { auth, .. } => return auth.into(),
+ _ => {},
+ }
match &wanted {