svn commit: samba r15358 - in branches/SAMBA_4_0/source: lib/appweb/ejs lib/appweb/mpr lib/socket_wrapper libcli/ldap ntvfs/posix rpc_server/winreg torture/com torture/rpc

[Stefan (metze) Metzmacher]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

jelmer at samba.org schrieb:

Hi Jelmer,

> Modified: branches/SAMBA_4_0/source/libcli/ldap/ldap_controls.c
> ===================================================================
> --- branches/SAMBA_4_0/source/libcli/ldap/ldap_controls.c	2006-04-30 06:44:19 UTC (rev 15357)
> +++ branches/SAMBA_4_0/source/libcli/ldap/ldap_controls.c	2006-04-30 13:54:03 UTC (rev 15358)
> @@ -127,9 +127,11 @@
>  		}
>  
>  		if (asn1_peek_tag(&data, ASN1_BOOLEAN)) {
> -			if (!asn1_read_BOOLEAN(&data, &(lssc[num]->reverse))) {
> +			bool reverse;
> +			if (!asn1_read_BOOLEAN(&data, &reverse)) {
>  			return False;
>  			}
> +			lssc[num]->reverse = reverse;
>  		}
>  	
>  		if (!asn1_end_tag(&data)) {
> @@ -902,9 +904,11 @@
>  	}
>  
>  	if (asn1_peek_tag(data, ASN1_BOOLEAN)) {
> -		if (!asn1_read_BOOLEAN(data, &(ctrl->critical))) {
> +		bool critical;

shouldn't this be BOOL, I think we should just use BOOL OR bool
consistent in the whole tree.

> +		if (!asn1_read_BOOLEAN(data, &critical)) {
>  			return False;
>  		}
> +		critical = ctrl->critical;

this should be
		ctr1->critical = critical;

>  	} else {
>  		ctrl->critical = False;
>  	}

metze
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFEVMcgm70gjA5TCD8RAgL0AJ40g09ArPI9gwC6mP/QsN6zdf0+cgCfTyQ4
bRvZh0tRIlslD/rM90TIqHM=
=/+Cg
-----END PGP SIGNATURE-----