diff src/libpam/environ.rs @ 163:a75a66cb4181

Add end-to-end tests; fix issues found by tests. - Create tests and installer/remover shell script - Fix Pointer/pointee problems - Add Debug formatting - Misc cleanup
author Paul Fisher <paul@pfish.zone>
date Mon, 14 Jul 2025 17:40:11 -0400
parents 56b559b7ecea
children
line wrap: on
line diff
--- a/src/libpam/environ.rs	Mon Jul 14 15:07:16 2025 -0400
+++ b/src/libpam/environ.rs	Mon Jul 14 17:40:11 2025 -0400
@@ -11,7 +11,7 @@
     fn environ_get(&self, key: &OsStr) -> Option<OsString> {
         let key = CString::new(key.as_bytes()).ok()?;
         // SAFETY: We are a valid handle and are calling with a good key.
-        let src = unsafe { libpam_sys::pam_getenv(self.raw_ref(), key.as_ptr()) };
+        let src = unsafe { libpam_sys::pam_getenv(self.inner(), key.as_ptr()) };
         let val = match NonNull::new(src) {
             None => return None,
             Some(ptr) => ptr.as_ptr(),
@@ -39,14 +39,14 @@
         let put = CString::new(result).unwrap();
         // SAFETY: This is a valid handle and a valid environment string.
         // pam_putenv is only ever going to
-        let _ = unsafe { libpam_sys::pam_putenv(self.raw_mut(), put.as_ptr()) };
+        let _ = unsafe { libpam_sys::pam_putenv(self.inner_mut(), put.as_ptr()) };
         old
     }
 
     fn environ_iter(&self) -> impl Iterator<Item = (OsString, OsString)> {
         // SAFETY: This is a valid PAM handle. It will return valid data.
         unsafe {
-            NonNull::new(libpam_sys::pam_getenvlist(self.raw_ref()))
+            NonNull::new(libpam_sys::pam_getenvlist(self.inner()))
                 .map(|ptr| EnvList::from_ptr(ptr.cast()))
                 .unwrap_or_else(EnvList::empty)
         }