From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Fri, 7 Aug 2020 23:57:25 +0000 (+0100)
Subject: insist on IUSER
X-Git-Tag: otter-0.2.0~1167
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=964095c2d7a70e854c988f57fe65a1d97760662c;p=otter.git

insist on IUSER
---

diff --git a/src/bin/otter.rs b/src/bin/otter.rs
index b5e72e70..57d6cf6d 100644
--- a/src/bin/otter.rs
+++ b/src/bin/otter.rs
@@ -117,20 +117,21 @@ fn main() {
                      "use USER scope");
     ap.parse_args()?;
     mem::drop(ap);
-    /*
     mainopts.scope.get_or_insert_with(||{
       let user = env::var("USER").unwrap_or_else(|e|{
         // want to call ap.error but we have to drop it because
         // otherwise it still has mainopts.scope borrowed
-        ap.error(
+        eprintln!("bad usage: --scope-unix needs USER env var: {}", &e);
+        exit(12);
+      });
+      ManagementScope::Unix { user }
     });
-     */
     <Result<_,i32>>::Ok(mainopts)
     /*
 
     Cell::from_mut(&mut mainopts.scope);
     let opts = MainOpts::from_args();
 */
-  })().unwrap_or_else(|rc| std::process::exit(if rc!=0 { 12 } else { 0 }));
+  })().unwrap_or_else(|rc| exit(if rc!=0 { 12 } else { 0 }));
   println!("{:?}", &mainopts);
 }