mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-04-06 15:00:40 +08:00
Code Issues Packages Projects Releases Wiki Activity

add some friendly output of server control responses; please review

Browse Source
This commit is contained in:
Pierangelo Masarati 2005-11-23 01:18:18 +00:00
parent 478360925b
commit 337e297faf
4 changed files with 151 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

157
clients/tools/common.c
View File

@ -101,6 +101,7 @@ int referrals = 0;
int protocol = -1;
int verbose = 0;
int version = 0;
int ldif = 0;
#ifdef LDAP_CONTROL_X_CHAINING_BEHAVIOR
int chaining = 0;
@ -1304,15 +1305,15 @@ tool_check_abandon( LDAP *ld, int msgid )
}
void tool_print_ctrls(
LDAPControl **ctrls,
int ldif )
LDAP *ld,
LDAPControl **ctrls )
{
int i;
char *ptr;
for ( i = 0; ctrls[i] != NULL; i++ ) {
/* control: OID criticality base64value */
struct berval *b64 = NULL;
struct berval b64 = BER_BVNULL;
ber_len_t len;
char *str;
@ -1324,21 +1325,19 @@ void tool_print_ctrls(
? sizeof("true") : sizeof("false");
/* convert to base64 */
if( ctrls[i]->ldctl_value.bv_len ) {
b64 = ber_memalloc( sizeof(struct berval) );
b64->bv_len = LUTIL_BASE64_ENCODE_LEN(
if ( ctrls[i]->ldctl_value.bv_len ) {
b64.bv_len = LUTIL_BASE64_ENCODE_LEN(
ctrls[i]->ldctl_value.bv_len ) + 1;
b64->bv_val = ber_memalloc( b64->bv_len + 1 );
b64.bv_val = ber_memalloc( b64.bv_len + 1 );
b64->bv_len = lutil_b64_ntop(
b64.bv_len = lutil_b64_ntop(
(unsigned char *) ctrls[i]->ldctl_value.bv_val,
ctrls[i]->ldctl_value.bv_len,
b64->bv_val, b64->bv_len );
b64.bv_val, b64.bv_len );
}
if ( b64 ) {
len += 1 + b64->bv_len;
if ( b64.bv_len ) {
len += 1 + b64.bv_len;
}
ptr = str = malloc( len + 1 );
@ -1349,9 +1348,9 @@ void tool_print_ctrls(
ptr = lutil_strcopy( ptr, ctrls[i]->ldctl_iscritical
? " true" : " false" );
if( b64 ) {
if ( b64.bv_len ) {
ptr = lutil_strcopy( ptr, " " );
ptr = lutil_strcopy( ptr, b64->bv_val );
ptr = lutil_strcopy( ptr, b64.bv_val );
}
if ( ldif < 2 ) {
@ -1360,7 +1359,135 @@ void tool_print_ctrls(
}
free( str );
ber_bvfree( b64 );
if ( b64.bv_len ) {
ber_memfree( b64.bv_val );
}
/* known controls */
if ( strcmp( ctrls[i]->ldctl_oid, LDAP_CONTROL_PRE_READ ) == 0
|| strcmp( ctrls[i]->ldctl_oid, LDAP_CONTROL_POST_READ ) == 0 )
{
BerElement *ber;
struct berval bv;
struct berval what;
if ( strcmp( ctrls[i]->ldctl_oid, LDAP_CONTROL_PRE_READ ) == 0 ) {
BER_BVSTR( &what, "preread" );
} else {
BER_BVSTR( &what, "postread" );
}
tool_write_ldif( LDIF_PUT_COMMENT, "==> ", what.bv_val, what.bv_len );
ber = ber_init( &ctrls[i]->ldctl_value );
if ( ber == NULL ) {
/* ... */
} else if ( ber_scanf( ber, "{m{" /*}}*/, &bv ) == LBER_ERROR ) {
/* ... */
} else {
tool_write_ldif( LDIF_PUT_VALUE, "dn", bv.bv_val, bv.bv_len );
while ( ber_scanf( ber, "{m" /*}*/, &bv ) != LBER_ERROR ) {
int i;
BerVarray vals = NULL;
if ( ber_scanf( ber, "[W]", &vals ) == LBER_ERROR || vals == NULL ) {
/* error? */
continue;
}
for ( i = 0; vals[ i ].bv_val != NULL; i++ ) {
tool_write_ldif( ldif ? LDIF_PUT_COMMENT : LDIF_PUT_VALUE,
bv.bv_val, vals[ i ].bv_val, vals[ i ].bv_len );
}
ber_bvarray_free( vals );
}
}
if ( ber != NULL ) {
ber_free( ber, 1 );
}
tool_write_ldif( LDIF_PUT_COMMENT, "<== ", what.bv_val, what.bv_len );
#ifdef LDAP_CONTROL_PAGEDRESULTS
} else if ( strcmp( ctrls[i]->ldctl_oid, LDAP_CONTROL_PAGEDRESULTS ) == 0 ) {
BerElement *ber;
struct berval cookie;
int size;
ber = ber_init( &ctrls[i]->ldctl_value );
if ( ber_scanf( ber, "{im}", &size, &cookie ) == LBER_ERROR ) {
/* ... */
} else {
char buf[ BUFSIZ ], *ptr = buf;
if ( size > 0 ) {
ptr += snprintf( ptr, sizeof( buf ) - ( ptr - buf ),
"estimate=%d", size );
}
if ( cookie.bv_len > 0 ) {
struct berval bv;
bv.bv_len = LUTIL_BASE64_ENCODE_LEN(
cookie.bv_len ) + 1;
bv.bv_val = ber_memalloc( bv.bv_len + 1 );
bv.bv_len = lutil_b64_ntop(
(unsigned char *) cookie.bv_val,
cookie.bv_len,
bv.bv_val, bv.bv_len );
ptr += snprintf( ptr, sizeof( buf ) - ( ptr - buf ),
"%scookie=%s", ptr == buf ? "" : " ",
bv.bv_val );
ber_memfree( bv.bv_val );
}
tool_write_ldif( ldif ? LDIF_PUT_COMMENT : LDIF_PUT_VALUE,
"pagedresults", buf, ptr - buf );
}
if ( ber != NULL ) {
ber_free( ber, 1 );
}
#endif /* LDAP_CONTROL_PAGEDRESULTS */
#ifdef LDAP_CONTROL_PASSWORDPOLICYREQUEST
} else if ( strcmp( ctrls[i]->ldctl_oid, LDAP_CONTROL_PASSWORDPOLICYRESPONSE ) == 0 ) {
int expire = 0, grace = 0, rc;
LDAPPasswordPolicyError pperr;
rc = ldap_parse_passwordpolicy_control( ld, ctrls[ i ],
&expire, &grace, &pperr );
if ( rc == LDAP_SUCCESS ) {
char buf[ BUFSIZ ], *ptr = buf;
if ( expire != -1 ) {
ptr += snprintf( ptr, sizeof( buf ) - ( ptr - buf ),
"expire=%d", expire );
}
if ( grace != -1 ) {
ptr += snprintf( ptr, sizeof( buf ) - ( ptr - buf ),
"%sgrace=%d", ptr == buf ? "" : " ", grace );
}
if ( pperr != PP_noError ) {
ptr += snprintf( ptr, sizeof( buf ) - ( ptr - buf ),
"%serror=%s", ptr == buf ? "" : " ",
ldap_passwordpolicy_err2txt( pperr ) );
}
tool_write_ldif( ldif ? LDIF_PUT_COMMENT : LDIF_PUT_VALUE,
"ppolicy", buf, ptr - buf );
}
}
#endif /* LDAP_CONTROL_PASSWORDPOLICYREQUEST */
}
}

4
clients/tools/common.h
View File

@ -63,6 +63,8 @@ extern int protocol;
extern int verbose;
extern int version;
extern int ldif;
/* Defined in common.c, set in main() */
extern char *prog;
extern const char __Version[];
@ -89,7 +91,7 @@ void tool_perror LDAP_P((
const char *matched,
const char *info,
char **refs ));
void tool_print_ctrls LDAP_P(( LDAPControl **ctrls, int ldif ));
void tool_print_ctrls LDAP_P(( LDAP *ld, LDAPControl **ctrls ));
int tool_write_ldif LDAP_P(( int type, char *name, char *value, ber_len_t vallen ));

2
clients/tools/ldapmodify.c
View File

@ -1203,7 +1203,7 @@ static int process_response(
ber_memvfree( (void **)refs );
}
if ( ctrls != NULL ) {
tool_print_ctrls( ctrls, 0 );
tool_print_ctrls( ld, ctrls );
ldap_controls_free( ctrls );
}
return rc;

10
clients/tools/ldapsearch.c
View File

@ -195,7 +195,7 @@ static char *tmpdir = NULL;
static char *urlpre = NULL;
static char *base = NULL;
static char *sortattr = NULL;
static int includeufn, vals2tmp = 0, ldif = 0;
static int includeufn, vals2tmp = 0;
static int subentries = 0, valuesReturnFilter = 0;
static char *vrFilter = NULL;
@ -1308,7 +1308,7 @@ print_entry(
}
if( ctrls ) {
tool_print_ctrls( ctrls, ldif );
tool_print_ctrls( ld, ctrls );
ldap_controls_free( ctrls );
}
@ -1415,7 +1415,7 @@ static void print_reference(
}
if( ctrls ) {
tool_print_ctrls( ctrls, ldif );
tool_print_ctrls( ld, ctrls );
ldap_controls_free( ctrls );
}
}
@ -1495,7 +1495,7 @@ static void print_partial(
}
if( ctrls ) {
tool_print_ctrls( ctrls, ldif );
tool_print_ctrls( ld, ctrls );
ldap_controls_free( ctrls );
}
}
@ -1576,7 +1576,7 @@ static int print_result(
}
if( ctrls ) {
tool_print_ctrls( ctrls, ldif );
tool_print_ctrls( ld, ctrls );
ldap_controls_free( ctrls );
}