mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-04-06 15:00:40 +08:00
Code Issues Packages Projects Releases Wiki Activity

More ITS#6353 - relent a bit: accept terminating NUL byte, which AD can send

Browse Source
This commit is contained in:
Hallvard Furuseth 2009-11-04 11:17:03 +00:00
parent f685d9e78b
commit 48048c5348
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/lber.h
View File

@ -279,6 +279,9 @@ ber_get_stringb LDAP_P((
#define LBER_BV_ALLOC 0x01 /* allocate/copy result, otherwise in-place */
#define LBER_BV_NOTERM 0x02 /* omit NUL-terminator if parsing in-place */
#define LBER_BV_STRING 0x04 /* fail if berval contains embedded \0 */
/* LBER_BV_STRING currently accepts a terminating \0 in the berval, because
* Active Directory sends that in at least the diagonsticMessage field.
*/
LBER_F( ber_tag_t )
ber_get_stringbv LDAP_P((

7
libraries/liblber/decode.c
View File

@ -481,7 +481,8 @@ ber_get_stringbv( BerElement *ber, struct berval *bv, int option )
tag = ber_skip_element( ber, bv );
if ( tag == LBER_DEFAULT ||
(( option & LBER_BV_STRING ) && memchr( bv->bv_val, 0, bv->bv_len )))
(( option & LBER_BV_STRING ) &&
bv->bv_len && memchr( bv->bv_val, 0, bv->bv_len - 1 )))
{
bv->bv_val = NULL;
return LBER_DEFAULT;
@ -518,7 +519,9 @@ ber_get_stringbv_null( BerElement *ber, struct berval *bv, int option )
return tag;
}
if (( option & LBER_BV_STRING ) && memchr( bv->bv_val, 0, bv->bv_len )) {
if (( option & LBER_BV_STRING ) &&
memchr( bv->bv_val, 0, bv->bv_len - 1 ))
{
bv->bv_val = NULL;
return LBER_DEFAULT;
}