mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2024-12-21 03:10:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

partially revert prev commit

Browse Source
This commit is contained in:
Howard Chu 2009-11-06 02:20:40 +00:00
parent 86d9e86afd
commit 9a65f35f2e
1 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
libraries/libldap/getdn.c
View File

@ -2133,13 +2133,12 @@ strval2str( struct berval *val, char *str, unsigned flags, ber_len_t *len )
* The length was checked in strval2strlen();
*/
cl = LDAP_UTF8_CHARLEN( &val->bv_val[ s ] );
/*
* there might be some chars we want to escape in form
* of a couple of hexdigits for optimization purposes
*/
if ( cl > 1 ) {
if ( !LDAP_DN_IS_PRETTY( flags )
if ( ( cl > 1 && !LDAP_DN_IS_PRETTY( flags ) )
#ifdef PRETTY_ESCAPE
#if 0
|| LDAP_DN_WILLESCAPE_HEX( flags, val->bv_val[ s ] )
@ -2154,17 +2153,16 @@ strval2str( struct berval *val, char *str, unsigned flags, ber_len_t *len )
#endif /* ! PRETTY_ESCAPE */
) {
for ( ; cl--; ) {
str[ d++ ] = '\\';
byte2hexpair( &val->bv_val[ s ], &str[ d ] );
s++;
d += 2;
}
for ( ; cl--; ) {
str[ d++ ] = '\\';
byte2hexpair( &val->bv_val[ s ], &str[ d ] );
s++;
d += 2;
}
} else {
for ( ; cl--; ) {
str[ d++ ] = val->bv_val[ s++ ];
}
} else if ( cl > 1 ) {
for ( ; cl--; ) {
str[ d++ ] = val->bv_val[ s++ ];
}
} else {