colin/greetd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pam: Avoid an unsafe block

Browse Source
This commit is contained in:
Kenny Levinsen
2020-01-07 18:49:10 +01:00
parent 08f3c5f873
commit 7ca088d7c0
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
greetd/src/pam/session.rs
View File

@@ -87,6 +87,8 @@ impl<'a> PamSession<'a> {
pub fn set_item(&mut self, item: PamItemType, value: &str) -> Result<(), Box<dyn Error>> { pub fn set_item(&mut self, item: PamItemType, value: &str) -> Result<(), Box<dyn Error>> {
let s = CString::new(value).unwrap(); let s = CString::new(value).unwrap();
self.last_code = PamReturnCode::from(unsafe { self.last_code = PamReturnCode::from(unsafe {
// pam_set_item is exposed in a weird way in pam_sys::wrapped, so
// we use the raw version here instead
pam_sys::raw::pam_set_item(self.handle, item as i32, s.as_ptr() as *const c_void) pam_sys::raw::pam_set_item(self.handle, item as i32, s.as_ptr() as *const c_void)
}); });
match self.last_code { match self.last_code {
@@ -97,9 +99,7 @@ impl<'a> PamSession<'a> {
pub fn get_user(&mut self) -> Result<String, Box<dyn Error>> { pub fn get_user(&mut self) -> Result<String, Box<dyn Error>> {
let mut p: *const i8 = ptr::null_mut(); let mut p: *const i8 = ptr::null_mut();
self.last_code = PamReturnCode::from(unsafe { self.last_code = pam_sys::get_user(self.handle, &mut p, ptr::null());
pam_sys::raw::pam_get_user(self.handle, &mut p, ptr::null())
});
match self.last_code { match self.last_code {
PamReturnCode::SUCCESS => { PamReturnCode::SUCCESS => {
Ok((unsafe { CStr::from_ptr(p) }).to_str().unwrap().to_string()) Ok((unsafe { CStr::from_ptr(p) }).to_str().unwrap().to_string())