From d713072b6a2d7b3a68897bb9e757385997d14288 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sun, 26 Jul 2020 22:50:22 +0100 Subject: [PATCH] rename managementscope::server --- src/cmdlistener.rs | 4 ++-- src/global.rs | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/cmdlistener.rs b/src/cmdlistener.rs index 6d5866e9..bfbe90d5 100644 --- a/src/cmdlistener.rs +++ b/src/cmdlistener.rs @@ -113,13 +113,13 @@ fn authorise_scope(cs: &CommandStream, wanted: &ManagementScope) match &wanted { - ManagementScope::XXX => { + ManagementScope::Server => { let y : AS< Authorised<(Passwd,uid_t)>, > = { let ok = cs.authorised_uid(None,None)?; (ok, - ManagementScope::XXX) + ManagementScope::Server) }; return y.into() }, diff --git a/src/global.rs b/src/global.rs index 7fcc1b9a..0eb138ad 100644 --- a/src/global.rs +++ b/src/global.rs @@ -46,7 +46,7 @@ pub struct Instance { #[derive(Debug,Clone,Deserialize,Serialize)] #[derive(Eq,PartialEq,Ord,PartialOrd,Hash)] pub enum ManagementScope { - XXX, + Server, Unix { user : String /* username, so filename-safe */ }, } @@ -227,7 +227,7 @@ impl InstanceGuard<'_> { fn savefile(name: &InstanceName, prefix: &str, suffix: &str) -> String { let scope_prefix = { use ManagementScope::*; match &name.scope { - XXX => format!(""), + Server => format!(""), Unix{user} => { format!("{}:", user) }, } }; iter::once(prefix) @@ -414,7 +414,7 @@ const XXX_PLAYERS_TOKENS : &[(&str, &str)] = &[ pub fn xxx_global_setup() { let gs = xxx_gamestate_init(); let gref = Instance::new(InstanceName { - scope: ManagementScope::XXX, + scope: ManagementScope::Server, scoped_name: "dummy".to_string() }, gs).expect("xxx create dummy"); let mut g = gref.lock()?; -- 2.30.2