Fix extensible filters

diff --git a/libraries/libldap/filter.c b/libraries/libldap/filter.c
index 7dded23d02182ac0a24b40713680e9e8aff8933e..4f475830ad7c995d1c743ca9d770e39fd5313826 100644 (file)
--- a/libraries/libldap/filter.c
+++ b/libraries/libldap/filter.c
@@ -591,18 +591,23 @@ put_simple_filter(
                        if( rc != -1 && *str != '\0' ) {
                                rc = ber_printf( ber, "ts", LDAP_FILTER_EXT_TYPE, str );
                        }
-
                        if( rc != -1 ) {
                                ber_slen_t len = ldap_pvt_filter_value_unescape( value );
 
                                if( len >= 0 ) {
-                                       rc = ber_printf( ber, /*"{"*/ "totbN}",
-                                               LDAP_FILTER_EXT_VALUE, value, len,
-                                               LDAP_FILTER_EXT_DNATTRS, dn != NULL);
+                                       rc = ber_printf( ber, "to",
+                                               LDAP_FILTER_EXT_VALUE, value, len );
                                } else {
                                        rc = -1;
                                }
                        }
+                       if( rc != -1 && dn ) {
+                               rc = ber_printf( ber, "tb",
+                                       LDAP_FILTER_EXT_DNATTRS, (ber_int_t) 1 );
+                       }
+                       if( rc != -1 ) { 
+                               rc = ber_printf( ber, /*"{"*/ "N}" );
+                       }
                }
                goto done;