[PATCH] Update pam_wrapper in Samba to version 1.0.4

[Jeremy Allison]

On Mon, May 15, 2017 at 05:28:30PM +0200, Andreas Schneider via samba-technical wrote:
> Hi,
> 
> the attached patch updates the copy of pam_wrapper in Samba to version 1.0.4.
> 
> 
> Review and push much appreciated.

LGTM. Pushed !

> Thanks,
> 
> 
> 	Andreas
> 
> -- 
> Andreas Schneider                   GPG-ID: CC014E3D
> Samba Team                             asn at samba.org
> www.samba.org

> From 72e9deb8fa1a137ba05ca64599516a4f2b4393e3 Mon Sep 17 00:00:00 2001
> From: Andreas Schneider <asn at samba.org>
> Date: Mon, 15 May 2017 17:25:27 +0200
> Subject: [PATCH] lib: Update pam_wrapper to 1.0.4
> 
> * Fix build on OpenBSD
> * Fix a resource leak
> 
> Signed-off-by: Andreas Schneider <asn at samba.org>
> ---
>  lib/pam_wrapper/pam_wrapper.c | 5 ++++-
>  lib/pam_wrapper/wscript       | 2 +-
>  2 files changed, 5 insertions(+), 2 deletions(-)
> 
> diff --git a/lib/pam_wrapper/pam_wrapper.c b/lib/pam_wrapper/pam_wrapper.c
> index d1ae07582d8..4be81460a5b 100644
> --- a/lib/pam_wrapper/pam_wrapper.c
> +++ b/lib/pam_wrapper/pam_wrapper.c
> @@ -513,12 +513,14 @@ static void libpam_pam_vsyslog(const pam_handle_t *pamh,
>  			       const char *fmt,
>  			       va_list args)
>  {
> +#ifdef HAVE_PAM_VSYSLOG
>  	pwrap_bind_symbol_libpam(pam_vsyslog);
>  
>  	pwrap.libpam.symbols._libpam_pam_vsyslog.f(pamh,
>  						   priority,
>  						   fmt,
>  						   args);
> +#endif
>  }
>  
>  /*********************************************************
> @@ -551,7 +553,8 @@ static int p_copy(const char *src, const char *dst, const char *pdir, mode_t mod
>  	if (mode == 0) {
>  		rc = fstat(srcfd, &sb);
>  		if (rc != 0) {
> -			return -1;
> +			rc = -1;
> +			goto out;
>  		}
>  		mode = sb.st_mode;
>  	}
> diff --git a/lib/pam_wrapper/wscript b/lib/pam_wrapper/wscript
> index aacd1d76149..cfd8b4f9baf 100644
> --- a/lib/pam_wrapper/wscript
> +++ b/lib/pam_wrapper/wscript
> @@ -2,7 +2,7 @@
>  
>  import os
>  
> -VERSION="1.0.3"
> +VERSION="1.0.4"
>  
>  def find_library(library_names, lookup_paths):
>      for directory in lookup_paths:
> -- 
> 2.12.2
>