[SCM] Samba Shared Repository - branch master updated

[Stefan (metze) Metzmacher]

Hi Björn,

> - Log -----------------------------------------------------------------
> commit ec94efb79d4516b09c7d1d93a4ff8ce0f7046f41
> Author: Björn Jacke <bj at sernet.de>
> Date:   Thu Jun 10 17:19:16 2010 +0200
> 
>     s3: fix build on HP-UX
>     
>     this struct member h_errno is not used in the HP-UX code paths, it was just
>     there because Solaris has it, too. As h_errno is a function call macro on HP-UX
>     when thread support is enabled we run into trouble here. Just commenting it out
>     should be okay as we don't use it anyway.
> 
> -----------------------------------------------------------------------
> 
> Summary of changes:
>  nsswitch/winbind_nss_hpux.h |    7 ++++++-
>  1 files changed, 6 insertions(+), 1 deletions(-)
> 
> 
> Changeset truncated at 500 lines:
> 
> diff --git a/nsswitch/winbind_nss_hpux.h b/nsswitch/winbind_nss_hpux.h
> index 40a352d..393c0a3 100644
> --- a/nsswitch/winbind_nss_hpux.h
> +++ b/nsswitch/winbind_nss_hpux.h
> @@ -130,7 +130,12 @@ typedef struct nss_XbyY_args {
>  
>  	void *returnval;
>  	int erange;
> -	int h_errno;
> +	/*
> +	*  h_errno is defined as function call macro for multithreaded applications
> +	*  in HP-UX. *this* h_errno is not used in the HP-UX codepath of our nss
> +	*  modules, so let's simply comment it out here:
> +	* int h_errno;
> +	*/
>  	nss_status_t status;
>  } nss_XbyY_args_t;

Aren't this structures of fixed predefined size?
Don't we use this to cast a given buffer into something we use?

If so args->status is wrong now and we better keep an 'int _not_used'.

metze

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 262 bytes
Desc: OpenPGP digital signature
URL: <http://lists.samba.org/pipermail/samba-cvs/attachments/20100610/eab5e697/attachment.pgp>