From ab481c0f7426695c9abee29e2c4467405c75c64d Mon Sep 17 00:00:00 2001 From: Howard Chu Date: Thu, 29 Mar 2012 06:05:15 -0700 Subject: [PATCH] ITS#7149 fix back-shell/back-perl Modify with binary values --- servers/slapd/back-perl/modify.c | 11 ++++++----- servers/slapd/back-shell/modify.c | 13 +++++++++---- 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/servers/slapd/back-perl/modify.c b/servers/slapd/back-perl/modify.c index d05f71dec0..237a782de2 100644 --- a/servers/slapd/back-perl/modify.c +++ b/servers/slapd/back-perl/modify.c @@ -42,26 +42,27 @@ perl_back_modify( switch ( mods->sm_op & ~LDAP_MOD_BVALUES ) { case LDAP_MOD_ADD: - XPUSHs(sv_2mortal(newSVpv("ADD", 0 ))); + XPUSHs(sv_2mortal(newSVpv("ADD", STRLENOF("ADD") ))); break; case LDAP_MOD_DELETE: - XPUSHs(sv_2mortal(newSVpv("DELETE", 0 ))); + XPUSHs(sv_2mortal(newSVpv("DELETE", STRLENOF("DELETE") ))); break; case LDAP_MOD_REPLACE: - XPUSHs(sv_2mortal(newSVpv("REPLACE", 0 ))); + XPUSHs(sv_2mortal(newSVpv("REPLACE", STRLENOF("REPLACE") ))); break; } - XPUSHs(sv_2mortal(newSVpv( mods->sm_desc->ad_cname.bv_val, 0 ))); + XPUSHs(sv_2mortal(newSVpv( mods->sm_desc->ad_cname.bv_val, + mods->sm_desc->ad_cname.bv_len ))); for ( i = 0; mods->sm_values != NULL && mods->sm_values[i].bv_val != NULL; i++ ) { - XPUSHs(sv_2mortal(newSVpv( mods->sm_values[i].bv_val, 0 ))); + XPUSHs(sv_2mortal(newSVpv( mods->sm_values[i].bv_val, mods->sm_values[i].bv_len ))); } /* Fix delete attrib without value. */ diff --git a/servers/slapd/back-shell/modify.c b/servers/slapd/back-shell/modify.c index ecf05450bf..5df09628c1 100644 --- a/servers/slapd/back-shell/modify.c +++ b/servers/slapd/back-shell/modify.c @@ -37,6 +37,7 @@ #include "slap.h" #include "shell.h" +#include "ldif.h" int shell_back_modify( @@ -87,8 +88,6 @@ shell_back_modify( for ( ; ml != NULL; ml = ml->sml_next ) { mod = &ml->sml_mod; - /* FIXME: should use LDIF routines to deal with binary data */ - switch ( mod->sm_op ) { case LDAP_MOD_ADD: fprintf( wfp, "add: %s\n", mod->sm_desc->ad_cname.bv_val ); @@ -105,8 +104,14 @@ shell_back_modify( if( mod->sm_values != NULL ) { for ( i = 0; mod->sm_values[i].bv_val != NULL; i++ ) { - fprintf( wfp, "%s: %s\n", mod->sm_desc->ad_cname.bv_val, - mod->sm_values[i].bv_val /* binary! */ ); + char *out = ldif_put( LDIF_PUT_VALUE, + mod->sm_desc->ad_cname.bv_val, + mod->sm_values[i].bv_val, + mod->sm_values[i].bv_len ); + if ( out ) { + fprintf( wfp, "%s", out ); + ber_memfree( out ); + } } } -- 2.39.5