[PATCH] Fix build failure with recent clean-up in krb5_wrap

[Michael Adam]

On 2016-09-01 at 11:35 +0530, Anoop C S wrote:
> Hi all,
> 
> Please find the attached patch which fixes build failure with recent
> krb5_wrap changes.

Looks good to me (i.e. RB:me).
Thanks!

I don't know enough about kerberos to understand what that
annoyingly long #if conditions mean, but it seems our
(auto)build system does not cover these.

Which just reminds me of the vasabi project that lets
you build (and optionally test) samba in disposable
containers (controlled by vagrant), and which I presented
at sambaXP 2015.
(https://www.samba.org/~obnox/presentations/sambaXP-2015/2015-sambaXP-obnox-vagrant.pr.pdf)
(https://git.samba.org/?p=obnox/vasabi.git;a=summary)

:-)

Cheers - Michael


> From d9265b685843a25125aa8de2bb2a6a07ba4920bb Mon Sep 17 00:00:00 2001
> From: Anoop C S <anoopcs at redhat.com>
> Date: Thu, 1 Sep 2016 11:25:32 +0530
> Subject: [PATCH] krb5_wrap: Remove extra parentheses causing compile error
> 
> Signed-off-by: Anoop C S <anoopcs at redhat.com>
> ---
>  lib/krb5_wrap/krb5_samba.c | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/lib/krb5_wrap/krb5_samba.c b/lib/krb5_wrap/krb5_samba.c
> index 24d64cc..841e3f8 100644
> --- a/lib/krb5_wrap/krb5_samba.c
> +++ b/lib/krb5_wrap/krb5_samba.c
> @@ -3118,7 +3118,7 @@ static krb5_error_code ads_krb5_mk_req(krb5_context context,
>  			if (retval != 0) {
>  				DBG_WARNING("krb5_auth_con_setuseruserkey "
>  					    "failed (%s)\n",
> -					    error_message(retval)));
> +					    error_message(retval));
>  				goto cleanup_creds;
>  			}
>  
> @@ -3128,7 +3128,7 @@ static krb5_error_code ads_krb5_mk_req(krb5_context context,
>  							KRB5_AUTH_CONTEXT_USE_SUBKEY);
>  			if (retval != 0) {
>  				DBG_WARNING("krb5_auth_con_setflags failed (%s)\n",
> -					    error_message(retval)));
> +					    error_message(retval));
>  				goto cleanup_creds;
>  			}
>  
> @@ -3160,7 +3160,7 @@ static krb5_error_code ads_krb5_mk_req(krb5_context context,
>  				retval = ads_setup_auth_context(context, auth_context);
>  				if (retval != 0) {
>  					DBG_WARNING("ads_setup_auth_context failed (%s)\n",
> -						    error_message(retval)));
> +						    error_message(retval));
>  					goto cleanup_creds;
>  				}
>  			} else {
> -- 
> 2.7.4
> 

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 163 bytes
Desc: not available
URL: <http://lists.samba.org/pipermail/samba-technical/attachments/20160901/7355c96b/signature.sig>