Commit 07a37a86 authored by Quanah Gibson-Mount's avatar Quanah Gibson-Mount
Browse files

ITS#6775

parent e881dc4e
...@@ -14,6 +14,7 @@ OpenLDAP 2.4.24 Engineering ...@@ -14,6 +14,7 @@ OpenLDAP 2.4.24 Engineering
Added slapo-sssvlv multiple sorts per connection (ITS#6686) Added slapo-sssvlv multiple sorts per connection (ITS#6686)
Added contrib/kinit for kerberos tickets Added contrib/kinit for kerberos tickets
Added contrib/noopsrch for entry counting (ITS#6598) Added contrib/noopsrch for entry counting (ITS#6598)
Fixed client tools control logging (ITS#6775)
Fixed liblber to not close invalid sockets (ITS#6585) Fixed liblber to not close invalid sockets (ITS#6585)
Fixed liblber unmatched brace handling (ITS#6764) Fixed liblber unmatched brace handling (ITS#6764)
Fixed liblber error setting (ITS#6732) Fixed liblber error setting (ITS#6732)
......
...@@ -1860,6 +1860,7 @@ print_prepostread( LDAP *ld, LDAPControl *ctrl, struct berval *what) ...@@ -1860,6 +1860,7 @@ print_prepostread( LDAP *ld, LDAPControl *ctrl, struct berval *what)
while ( ber_scanf( ber, "{m" /*}*/, &bv ) != LBER_ERROR ) { while ( ber_scanf( ber, "{m" /*}*/, &bv ) != LBER_ERROR ) {
int i; int i;
BerVarray vals = NULL; BerVarray vals = NULL;
char *str = NULL;
if ( ber_scanf( ber, "[W]", &vals ) == LBER_ERROR || if ( ber_scanf( ber, "[W]", &vals ) == LBER_ERROR ||
vals == NULL ) vals == NULL )
...@@ -1867,14 +1868,25 @@ print_prepostread( LDAP *ld, LDAPControl *ctrl, struct berval *what) ...@@ -1867,14 +1868,25 @@ print_prepostread( LDAP *ld, LDAPControl *ctrl, struct berval *what)
/* error? */ /* error? */
return 1; return 1;
} }
if ( ldif ) {
char *ptr;
str = malloc( bv.bv_len + STRLENOF(": ") + 1 );
ptr = str;
ptr = lutil_strncopy( ptr, bv.bv_val, bv.bv_len );
ptr = lutil_strcopy( ptr, ": " );
}
for ( i = 0; vals[ i ].bv_val != NULL; i++ ) { for ( i = 0; vals[ i ].bv_val != NULL; i++ ) {
tool_write_ldif( tool_write_ldif(
ldif ? LDIF_PUT_COMMENT : LDIF_PUT_VALUE, ldif ? LDIF_PUT_COMMENT : LDIF_PUT_VALUE,
bv.bv_val, vals[ i ].bv_val, vals[ i ].bv_len ); ldif ? str : bv.bv_val, vals[ i ].bv_val, vals[ i ].bv_len );
} }
ber_bvarray_free( vals ); ber_bvarray_free( vals );
if ( str ) free( str );
} }
} }
...@@ -1954,7 +1966,8 @@ print_paged_results( LDAP *ld, LDAPControl *ctrl ) ...@@ -1954,7 +1966,8 @@ print_paged_results( LDAP *ld, LDAPControl *ctrl )
} }
tool_write_ldif( ldif ? LDIF_PUT_COMMENT : LDIF_PUT_VALUE, tool_write_ldif( ldif ? LDIF_PUT_COMMENT : LDIF_PUT_VALUE,
"pagedresults", buf, ptr - buf ); ldif ? "pagedresults: " : "pagedresults",
buf, ptr - buf );
} }
return 0; return 0;
...@@ -1974,7 +1987,7 @@ print_sss( LDAP *ld, LDAPControl *ctrl ) ...@@ -1974,7 +1987,7 @@ print_sss( LDAP *ld, LDAPControl *ctrl )
err, ldap_err2string(err), attr ? " " : "", attr ? attr : "" ); err, ldap_err2string(err), attr ? " " : "", attr ? attr : "" );
tool_write_ldif( ldif ? LDIF_PUT_COMMENT : LDIF_PUT_VALUE, tool_write_ldif( ldif ? LDIF_PUT_COMMENT : LDIF_PUT_VALUE,
"sortResult", buf, rc ); ldif ? "sortResult: " : "sortResult", buf, rc );
} }
return rc; return rc;
...@@ -2014,7 +2027,7 @@ print_vlv( LDAP *ld, LDAPControl *ctrl ) ...@@ -2014,7 +2027,7 @@ print_vlv( LDAP *ld, LDAPControl *ctrl )
ber_memfree( bv.bv_val ); ber_memfree( bv.bv_val );
tool_write_ldif( ldif ? LDIF_PUT_COMMENT : LDIF_PUT_VALUE, tool_write_ldif( ldif ? LDIF_PUT_COMMENT : LDIF_PUT_VALUE,
"vlvResult", buf, rc ); ldif ? "vlvResult" : "vlvResult", buf, rc );
} }
return rc; return rc;
...@@ -2174,7 +2187,7 @@ print_ppolicy( LDAP *ld, LDAPControl *ctrl ) ...@@ -2174,7 +2187,7 @@ print_ppolicy( LDAP *ld, LDAPControl *ctrl )
} }
tool_write_ldif( ldif ? LDIF_PUT_COMMENT : LDIF_PUT_VALUE, tool_write_ldif( ldif ? LDIF_PUT_COMMENT : LDIF_PUT_VALUE,
"ppolicy", buf, ptr - buf ); ldif ? "ppolicy: " : "ppolicy", buf, ptr - buf );
} }
return rc; return rc;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment