# HG changeset patch
# User Anthony Nowell <anowell@gmail.com>
# Date 1546373293 25200
# Node ID 539d81e3bdc2eb50675746ae6cd8e8e702e23ec8
# Parent  31618a75f251c35b60f7b73b966ec9972d3a831c# Parent  c16564971c0516a10c584a472b05bb99800d33b8
Merge pull request #4 from holycleugh/conv-fixes

Conv fixes

diff -r 31618a75f251 -r 539d81e3bdc2 pam/src/conv.rs
--- a/pam/src/conv.rs	Thu Apr 19 14:08:54 2018 -0600
+++ b/pam/src/conv.rs	Tue Jan 01 13:08:13 2019 -0700
@@ -1,6 +1,6 @@
 use libc::{c_char, c_int};
+use std::ffi::{CStr, CString};
 use std::ptr;
-use std::ffi::{CStr, CString};
 
 use constants::PamResultCode;
 use constants::*;
@@ -28,12 +28,13 @@
 /// will be relayed back.
 #[repr(C)]
 pub struct PamConv {
-    conv: extern "C" fn(num_msg: c_int,
-                        pam_message: &&PamMessage,
-                        pam_response: &mut *const PamResponse,
-                        appdata_ptr: *const AppDataPtr)
-                        -> PamResultCode,
-    appdata_ptr: *const AppDataPtr,
+    conv: extern "C" fn(
+        num_msg: c_int,
+        pam_message: &&PamMessage,
+        pam_response: &mut *const PamResponse,
+        appdata_ptr: *const AppDataPtr,
+    ) -> PamResultCode,
+    ppdata_ptr: *const AppDataPtr,
 }
 
 impl PamConv {
@@ -54,18 +55,21 @@
     /// styles.
     pub fn send(&self, style: PamMessageStyle, msg: &str) -> PamResult<Option<String>> {
         let mut resp_ptr: *const PamResponse = ptr::null();
+        let msg_cstr = CString::new(msg).unwrap();
         let msg = PamMessage {
             msg_style: style,
-            msg: CString::new(msg).unwrap().as_ptr(),
+            msg: msg_cstr.as_ptr(),
         };
 
         let ret = (self.conv)(1, &&msg, &mut resp_ptr, self.appdata_ptr);
 
         if PamResultCode::PAM_SUCCESS == ret {
-            if resp_ptr.is_null() {
+            // PamResponse.resp is null for styles that don't return user input like PAM_TEXT_INFO
+            let response = unsafe { (*resp_ptr).resp };
+            if response.is_null() {
                 Ok(None)
             } else {
-                let bytes = unsafe { CStr::from_ptr((*resp_ptr).resp).to_bytes() };
+                let bytes = unsafe { CStr::from_ptr(response).to_bytes() };
                 Ok(String::from_utf8(bytes.to_vec()).ok())
             }
         } else {