Merge pull request #11 from LuoZijun/patch-1

andrewdavidmackenzie · web-flow · commit 9f176dd36cd4 · 2019-01-08T17:45:16.000+01:00
Update kmesg_buffer.rs - instead of using environment variable "USER", just get the user (numeric) id using getuid() and compare to zero.
diff --git a/src/libproc/kmesg_buffer.rs b/src/libproc/kmesg_buffer.rs
@@ -149,10 +149,7 @@ pub fn kmsgbuf() -> Result<String, String> {
 }
 
 pub fn am_root() -> bool {
-    match env::var("USER") {
-        Ok(val) => val == "root",
-        Err(_) => false,
-    }
+    libc::getuid() == 0
 }
 
 // If you want this test to actually test something, then you need to run as root 'sudo cargo test'

Original file line number	Diff line number	Diff line change
`@@ -149,10 +149,7 @@ pub fn kmsgbuf() -> Result<String, String> {`
`149`	`149`	`}`
`150`	`150`
`151`	`151`	`pub fn am_root() -> bool {`
`152`		`- match env::var("USER") {`
`153`		`- Ok(val) => val == "root",`
`154`		`- Err(_) => false,`
`155`		`- }`
	`152`	`+ libc::getuid() == 0`
`156`	`153`	`}`
`157`	`154`
`158`	`155`	`// If you want this test to actually test something, then you need to run as root 'sudo cargo test'`