[PATCH] eldap fix

[Vin Shelton]

Ben Wing <ben at xemacs.org> writes:

> Vin -- try this.
>
> build source patch:
> Diff command:   bash -ci "cvs-diff --show-c-function -no-changelog "
> Files affected: modules/ldap/eldap.c
>
> Index: modules/ldap/eldap.c
> ===================================================================
> RCS file: /pack/xemacscvs/XEmacs/xemacs/modules/ldap/eldap.c,v
> retrieving revision 1.11
> diff -u -p -r1.11 eldap.c
> --- modules/ldap/eldap.c	2004/11/04 23:06:11	1.11
> +++ modules/ldap/eldap.c	2004/11/08 15:45:11
> @@ -767,18 +767,20 @@ or `replace'. ATTR is the LDAP attribute
>  	ldap_mods[i].mod_vals.modv_bvals =
>  	  alloca_array (struct berval *, 1 + len);
>  	j = 0;
> -	EXTERNAL_LIST_LOOP_2 (cur2, values)
> -	  {
> -	    CHECK_STRING (cur2);
> -	    ldap_mods[i].mod_vals.modv_bvals[j] = &(bervals[j]);
> -	    TO_EXTERNAL_FORMAT (LISP_STRING, cur2,
> -				ALLOCA, (bervals[j].bv_val,
> -					 bervals[j].bv_len),
> -				Qnative);
> -	    j++;
> -	  }
> -	ldap_mods[i].mod_vals.modv_bvals[j] = NULL;
> -	i++;
> +	{
> +	  EXTERNAL_LIST_LOOP_2 (cur2, values)
> +	    {
> +	      CHECK_STRING (cur2);
> +	      ldap_mods[i].mod_vals.modv_bvals[j] = &(bervals[j]);
> +	      TO_EXTERNAL_FORMAT (LISP_STRING, cur2,
> +				  ALLOCA, (bervals[j].bv_val,
> +					   bervals[j].bv_len),
> +				  Qnative);
> +	      j++;
> +	    }
> +	  ldap_mods[i].mod_vals.modv_bvals[j] = NULL;
> +	  i++;
> +	}
>        }
>    }
>    ldap_mods_ptrs[i] = NULL;
>
>
>

Works on Solaris 5.8.  I'm currently building on 5.5 - I'll let you
know if it doesn't work.

BTW, before you sent this patch, I tried to build --without-modules
and I still got module build failures on ldap.  Somehow that doesn't
seem right :-).  Whaddaya think, Jerry?  Did I have to turn off ldap,
too?


Thanks, Ben.

  - vin