upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-12-23 08:09:34 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix a couple FIXMEs: use ldif_put to allow for binary values in

Browse source 
compare and modify. Note that line wrapping is disabled; presumably
existing code expects the compare argument to use only a single line.
The manpage should be updated to note whether standard LDIF with
default line wrapping is expected or not. (Add uses default width already.)
This commit is contained in:
Howard Chu 2011-01-28 09:40:52 +00:00
parent 0a96599375
commit 36563721bc
2 changed files with 24 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
servers/slapd/back-sock/compare.c
View file

@ -27,6 +27,7 @@
#include "slap.h" #include "slap.h"
#include "back-sock.h" #include "back-sock.h"
#include "ldif.h"
int int
sock_back_compare( sock_back_compare(
@ -37,6 +38,7 @@ sock_back_compare(
AttributeDescription *entry = slap_schema.si_ad_entry; AttributeDescription *entry = slap_schema.si_ad_entry;
Entry e; Entry e;
FILE *fp; FILE *fp;
char *text;
e.e_id = NOID; e.e_id = NOID;
e.e_name = op->o_req_dn; e.e_name = op->o_req_dn;
@ -60,21 +62,23 @@ sock_back_compare(
return( -1 ); return( -1 );
} }
/*
* FIX ME: This should use LDIF routines so that binary
* values are properly dealt with
*/
/* write out the request to the compare process */ /* write out the request to the compare process */
fprintf( fp, "COMPARE\n" ); fprintf( fp, "COMPARE\n" );
fprintf( fp, "msgid: %ld\n", (long) op->o_msgid ); fprintf( fp, "msgid: %ld\n", (long) op->o_msgid );
sock_print_conn( fp, op->o_conn, si ); sock_print_conn( fp, op->o_conn, si );
sock_print_suffixes( fp, op->o_bd ); sock_print_suffixes( fp, op->o_bd );
fprintf( fp, "dn: %s\n", op->o_req_dn.bv_val ); fprintf( fp, "dn: %s\n", op->o_req_dn.bv_val );
fprintf( fp, "%s: %s\n\n", /* could be binary */
op->oq_compare.rs_ava->aa_desc->ad_cname.bv_val, text = ldif_put_wrap( LDIF_PUT_VALUE,
op->oq_compare.rs_ava->aa_value.bv_val /* could be binary! */ ); op->orc_ava->aa_desc->ad_cname.bv_val,
fclose( fp ); op->orc_ava->aa_value.bv_val,
op->orc_ava->aa_value.bv_len, LDIF_LINE_WIDTH_MAX );
if ( text ) {
fprintf( fp, "%s\n", text );
ber_memfree( text );
} else {
fprintf( fp, "\n\n" );
}
/* read in the result and send it along */ /* read in the result and send it along */
sock_read_and_send_results( op, rs, fp ); sock_read_and_send_results( op, rs, fp );

15
servers/slapd/back-sock/modify.c
View file

@ -27,6 +27,7 @@
#include "slap.h" #include "slap.h"
#include "back-sock.h" #include "back-sock.h"
#include "ldif.h"
int int
sock_back_modify( sock_back_modify(
@ -72,8 +73,6 @@ sock_back_modify(
for ( ; ml != NULL; ml = ml->sml_next ) { for ( ; ml != NULL; ml = ml->sml_next ) {
mod = &ml->sml_mod; mod = &ml->sml_mod;
/* FIXME: should use LDIF routines to deal with binary data */
switch ( mod->sm_op ) { switch ( mod->sm_op ) {
case LDAP_MOD_ADD: case LDAP_MOD_ADD:
fprintf( fp, "add: %s\n", mod->sm_desc->ad_cname.bv_val ); fprintf( fp, "add: %s\n", mod->sm_desc->ad_cname.bv_val );
@ -90,8 +89,16 @@ sock_back_modify(
if( mod->sm_values != NULL ) { if( mod->sm_values != NULL ) {
for ( i = 0; mod->sm_values[i].bv_val != NULL; i++ ) { for ( i = 0; mod->sm_values[i].bv_val != NULL; i++ ) {
fprintf( fp, "%s: %s\n", mod->sm_desc->ad_cname.bv_val, char *text = ldif_put_wrap( LDIF_PUT_VALUE,
mod->sm_values[i].bv_val /* binary! */ ); mod->sm_desc->ad_cname.bv_val,
mod->sm_values[i].bv_val,
mod->sm_values[i].bv_len, LDIF_LINE_WIDTH_MAX );
if ( text ) {
fprintf( fp, "%s", text );
ber_memfree( text );
} else {
break;
}
} }
} }