diff options
Diffstat (limited to 'src/lib.rs')
| -rw-r--r-- | src/lib.rs | 20 |
1 files changed, 10 insertions, 10 deletions
@@ -1,11 +1,12 @@ // Copyright (C) 2023 Tomasz Kramkowski <tomasz@kramkow.ski> // SPDX-License-Identifier: MIT +mod pam; mod passwd; use cap_std::fs::{Dir, OpenOptions}; -use pam::module::PamHandle; -use std::ffi::{c_char, c_int, CString}; +use pam::PAMHandle; +use std::ffi::{c_char, c_int, CStr}; use std::io::{ErrorKind, Write}; use std::panic; use std::path::Path; @@ -31,9 +32,8 @@ impl From<std::io::Error> for SessionError { } } -fn open_session(h: &PamHandle, mountpoint: &str) -> Result<(), SessionError> { - let user = h.get_user(None).or(Err(SessionError))?; - let user = CString::new(user).or(Err(SessionError))?; +fn open_session(h: &PAMHandle, mountpoint: &str) -> Result<(), SessionError> { + let user = h.get_user::<CStr>(None).or(Err(SessionError))?; let uid = passwd::get_uid_by_name(&user).ok_or(SessionError)?; let uid = uid.to_string(); let d = Dir::open_ambient_dir(mountpoint, cap_std::ambient_authority())?; @@ -52,23 +52,23 @@ const CG_MOUNT: &str = "/sys/fs/cgroup"; #[no_mangle] pub extern "C" fn pam_sm_open_session( - h: &mut PamHandle, + h: &mut PAMHandle, _flags: c_int, _argc: c_int, _argv: *const *const c_char, ) -> c_int { match panic::catch_unwind(|| open_session(h, CG_MOUNT)) { - Ok(Ok(())) => 0, - _ => 14, + Ok(Ok(())) => pam::SUCCESS, + _ => pam::SESSION_ERR, } } #[no_mangle] pub extern "C" fn pam_sm_close_session( - _h: &mut PamHandle, + _h: &mut PAMHandle, _flags: c_int, _argc: c_int, _argv: *const *const c_char, ) -> c_int { - 0 + pam::SUCCESS } |