Use required form if value is zero length, eg "attr-desc:".

Use BASE64 if attr-desc includes ";binary"

diff --git a/libraries/libldif/line64.c b/libraries/libldif/line64.c
index edec31540d35a8953718292501c2d8a39e98e573..203062431343824e242f25ef5b228691578311f9 100644 (file)
--- a/libraries/libldif/line64.c
+++ b/libraries/libldif/line64.c
@@ -349,6 +349,11 @@ ldif_sput(
        }
 #endif
 
+       if( vlen == 0 ) {
+               *(*out)++ = '\n';
+               return;
+       }
+
        switch( type ) {
        case LDIF_PUT_NOVALUE:
                *(*out)++ = '\n';
@@ -395,16 +400,14 @@ ldif_sput(
        *(*out)++ = ' ';
        len++;
 
-       if( vlen == 0 ) {
-               *(*out)++ = '\n';
-               return;
-       }
-
        stop = (const unsigned char *) (val + vlen);
 
        if ( type == LDIF_PUT_VALUE
                && isgraph( val[0] ) && val[0] != ':' && val[0] != '<'
                && isgraph( val[vlen-1] )
+#ifndef LDAP_BINARY_DEBUG
+               && strstr( name, ";binary" ) == NULL
+#endif
 #ifndef LDAP_PASSWD_DEBUG
                && strcasecmp( name, "userPassword" ) != 0      /* encode userPassword */
                && strcasecmp( name, "2.5.4.35" ) != 0          /* encode userPassword */