From 9153159c22d74adfc6f683e8ce16894018c91285 Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Wed, 28 Sep 2016 16:07:19 -0600 Subject: [PATCH] Check username as well --- programs/login/src/main.rs | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/programs/login/src/main.rs b/programs/login/src/main.rs index b512961..156c04e 100644 --- a/programs/login/src/main.rs +++ b/programs/login/src/main.rs @@ -95,19 +95,16 @@ pub fn main() { { let mut debug = File::open("debug:").unwrap(); - write!(debug, "hash: {}: '{}': {}\n", user, password, password_hash); + write!(debug, "{};{}\n", user, password_hash).unwrap(); } let mut passwd_string = String::new(); - { - let mut passwd_file = File::open("file:etc/passwd").unwrap(); - passwd_file.read_to_string(&mut passwd_string).unwrap(); - } + File::open("file:etc/passwd").unwrap().read_to_string(&mut passwd_string).unwrap(); let mut passwd_option = None; for line in passwd_string.lines() { if let Ok(passwd) = Passwd::parse(line) { - if password_hash == passwd.hash { + if user == passwd.user && password_hash == passwd.hash { passwd_option = Some(passwd); break; }