[SCM] pam wrapper repository - branch master updated

[Andreas Schneider]

The branch, master has been updated
       via  615fe23 pwrap: Disable audit on BSD
       via  f3ef1e8 modules: Add the path where we install the helper PAM modules to the .pc file
       via  bc51c04 libpamtest: Only reply in conversation for echo_on and echo_off
      from  31d374c Bump version to 1.0.1

https://git.samba.org/?p=pam_wrapper.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 615fe23acab323624fd732fd0272a768833e183e
Author: Andreas Schneider <asn at samba.org>
Date:   Mon May 9 09:51:00 2016 +0200

    pwrap: Disable audit on BSD
    
    This allows us to use pam_wrapper on BSD
    
    Signed-off-by: Andreas Schneider <asn at samba.org>
    Reviewed-by: Ralph Boehme <slow at samba.org>

commit f3ef1e8833fb809d3a4e8dd9051eb4ab31d76c78
Author: Jakub Hrozek <jakub.hrozek at posteo.se>
Date:   Fri May 6 12:00:10 2016 +0200

    modules: Add the path where we install the helper PAM modules to the .pc file
    
    A test needs to often know where are the helper pam modules
    (pam_get_items.so and pam_set_items.so). This patch adds a new variable
    to the pkg-config file that lets the user of pam_wrapper query the path
    like this:
        $ pkg-config --variable=modules pam_wrapper
        /usr/lib64/pam_wrapper
    
    And use that variable to define their own service files.
    
    Signed-off-by: Jakub Hrozek <jakub.hrozek at posteo.se>
    Reviewed-by: Andreas Schneider <asn at samba.org>
    Reviewed-by: Ralph Boehme <slow at samba.org>

commit bc51c0430df83a1fdf8d468920d73a656c32b704
Author: Jakub Hrozek <jakub.hrozek at posteo.se>
Date:   Thu May 5 15:53:46 2016 +0200

    libpamtest: Only reply in conversation for echo_on and echo_off
    
    Signed-off-by: Jakub Hrozek <jakub.hrozek at posteo.se>
    Reviewed-by: Andreas Schneider <asn at samba.org>
    Reviewed-by: Ralph Boehme <slow at samba.org>

-----------------------------------------------------------------------

Summary of changes:
 pam_wrapper.pc.cmake | 2 ++
 src/libpamtest.c     | 5 ++++-
 src/pam_wrapper.c    | 9 +++++++++
 3 files changed, 15 insertions(+), 1 deletion(-)


Changeset truncated at 500 lines:

diff --git a/pam_wrapper.pc.cmake b/pam_wrapper.pc.cmake
index 3c1c848..c1f407b 100644
--- a/pam_wrapper.pc.cmake
+++ b/pam_wrapper.pc.cmake
@@ -1,3 +1,5 @@
+modules=@LIB_INSTALL_DIR@/pam_wrapper
+
 Name: @APPLICATION_NAME@
 Description: The pam_wrapper library
 Version: @APPLICATION_VERSION@
diff --git a/src/libpamtest.c b/src/libpamtest.c
index c6d5b89..7119184 100644
--- a/src/libpamtest.c
+++ b/src/libpamtest.c
@@ -294,9 +294,12 @@ static int pamtest_simple_conv(int num_msg,
 		}
 	}
 
-	if (response) {
+	if (response && ri > 0) {
 		*response = reply;
+	} else {
+		free(reply);
 	}
+
 	return PAM_SUCCESS;
 }
 
diff --git a/src/pam_wrapper.c b/src/pam_wrapper.c
index fddc7fa..bc73f41 100644
--- a/src/pam_wrapper.c
+++ b/src/pam_wrapper.c
@@ -1518,6 +1518,15 @@ int audit_open(void)
 	return -1;
 }
 
+/* Disable BSD auditing */
+int cannot_audit(int x);
+int cannot_audit(int x)
+{
+	(void) x;
+
+	return 1;
+}
+
 /****************************
  * DESTRUCTOR
  ***************************/


-- 
pam wrapper repository