[PATCH] - Fix bug #10280 - winbind panic if AD server is down

[Michael Adam]

Obviously correct.

Pushed to autobuild and updated bso.

Michael

On 2014-07-01 at 20:32 -0700, Jeremy Allison wrote:
> The original fix applied for this got
> the out of memory check reversed. Can
> I get a review asap, as this needs to
> go into 4.0.next before Karolin freezes
> the tree.
> 
> Thanks !
> 
> Jeremy.

> >From defe4425c89eb4fccc4f6657bd8847e5dff659c3 Mon Sep 17 00:00:00 2001
> From: Jeremy Allison <jra at samba.org>
> Date: Tue, 1 Jul 2014 20:27:11 -0700
> Subject: [PATCH] s3:winbindd - fix bad bugfix for bug #10280 -  winbind panic
>  if AD server is down.
> 
> Previous bug fix reversed the sense of the test for out of memory.
> 
> https://bugzilla.samba.org/show_bug.cgi?id=10280
> 
> Signed-off-by: Jeremy Allison <jra at samba.org>
> ---
>  source3/winbindd/winbindd_cache.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/source3/winbindd/winbindd_cache.c b/source3/winbindd/winbindd_cache.c
> index 51f3e04..dfad8f5 100644
> --- a/source3/winbindd/winbindd_cache.c
> +++ b/source3/winbindd/winbindd_cache.c
> @@ -2129,14 +2129,14 @@ static NTSTATUS rids_to_names(struct winbindd_domain *domain,
>  			have_mapped = have_unmapped = false;
>  
>  			*names = talloc_array(mem_ctx, char *, num_rids);
> -			if (*names != NULL) {
> +			if (*names == NULL) {
>  				result = NT_STATUS_NO_MEMORY;
>  				goto error;
>  			}
>  
>  			*types = talloc_array(mem_ctx, enum lsa_SidType,
>  					      num_rids);
> -			if (*types != NULL) {
> +			if (*types == NULL) {
>  				result = NT_STATUS_NO_MEMORY;
>  				goto error;
>  			}
> -- 
> 1.9.1
> 

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 198 bytes
Desc: Digital signature
URL: <http://lists.samba.org/pipermail/samba-technical/attachments/20140702/409d3fb6/attachment.pgp>