mirror of
https://git.openldap.org/openldap/openldap.git
synced 2025-12-26 17:49:59 -05:00
enhanced dn parsing; see libraries/libldap/dntest for a 'demo'. Need to define USE_LDAP_DN_PARSING to override usual ldap_dn2ufn and so, and PARSE_UTF8 to parse attribute values as utf-8
This commit is contained in:
Pierangelo Masarati
parent
30af73da75
commit
0ba03b18e7
2 changed files with 711 additions and 227 deletions
|
|
@ -12,87 +12,192 @@
|
|||
*/
|
||||
#include "portable.h"
|
||||
|
||||
#include <stdlib.h>
|
||||
|
||||
#include <ac/stdlib.h>
|
||||
#include <ac/string.h>
|
||||
#include <ac/unistd.h>
|
||||
|
||||
#include <stdio.h>
|
||||
|
||||
#include <ldap.h>
|
||||
|
||||
#include "ldap-int.h"
|
||||
|
||||
#include "ldif.h"
|
||||
#include "lutil.h"
|
||||
#include "lutil_ldap.h"
|
||||
#include "ldap_defaults.h"
|
||||
|
||||
int
|
||||
main(int argc, char *argv[])
|
||||
main( int argc, char *argv[] )
|
||||
{
|
||||
int rc, i, debug = -1;
|
||||
int rc, i, debug = 0, f2 = 0;
|
||||
unsigned flags[ 2 ] = { 0U, 0U };
|
||||
char *str, buf[1024];
|
||||
char *strin, *str, *str2, buf[ 1024 ];
|
||||
LDAPDN *dn = NULL;
|
||||
|
||||
if (argc < 2) {
|
||||
fprintf(stderr, "usage: dntest <dn> [flags-in[,...]] [flags-out[,...]]\n\n");
|
||||
fprintf(stderr, "\tflags-in: V3,V2,DCE,PEDANTIC\n");
|
||||
fprintf(stderr, "\tflags-out: V3,V2,UFN,DCE,AD,PEDANTIC\n\n");
|
||||
return 0;
|
||||
while ( 1 ) {
|
||||
int opt = getopt( argc, argv, "d:" );
|
||||
|
||||
if ( opt == EOF ) {
|
||||
break;
|
||||
}
|
||||
|
||||
switch ( opt ) {
|
||||
case 'd':
|
||||
debug = atoi( optarg );
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
if (ber_set_option(NULL, LBER_OPT_DEBUG_LEVEL, &debug) != LBER_OPT_SUCCESS) {
|
||||
fprintf(stderr, "Could not set LBER_OPT_DEBUG_LEVEL %d\n", debug);
|
||||
}
|
||||
if (ldap_set_option(NULL, LDAP_OPT_DEBUG_LEVEL, &debug) != LDAP_OPT_SUCCESS) {
|
||||
fprintf(stderr, "Could not set LDAP_OPT_DEBUG_LEVEL %d\n", debug);
|
||||
optind--;
|
||||
argc -= optind;
|
||||
argv += optind;
|
||||
|
||||
if ( argc < 2 ) {
|
||||
fprintf( stderr, "usage: dntest <dn> [flags-in[,...]] [flags-out[,...]]\n\n" );
|
||||
fprintf( stderr, "\tflags-in: V3,V2,DCE,PEDANTIC\n" );
|
||||
fprintf( stderr, "\tflags-out: V3,V2,UFN,DCE,AD,PEDANTIC\n\n" );
|
||||
return( 0 );
|
||||
}
|
||||
|
||||
if ( strcmp(argv[1], "-") == 0) {
|
||||
if ( ber_set_option( NULL, LBER_OPT_DEBUG_LEVEL, &debug ) != LBER_OPT_SUCCESS ) {
|
||||
fprintf( stderr, "Could not set LBER_OPT_DEBUG_LEVEL %d\n", debug );
|
||||
}
|
||||
if ( ldap_set_option( NULL, LDAP_OPT_DEBUG_LEVEL, &debug ) != LDAP_OPT_SUCCESS ) {
|
||||
fprintf( stderr, "Could not set LDAP_OPT_DEBUG_LEVEL %d\n", debug );
|
||||
}
|
||||
|
||||
if ( strcmp( argv[ 1 ], "-" ) == 0 ) {
|
||||
size_t len;
|
||||
|
||||
fgets(buf, sizeof(buf), stdin);
|
||||
len = strlen(buf)-1;
|
||||
if (len >= 0 && buf[len] == '\n') {
|
||||
buf[len] = '\0';
|
||||
fgets( buf, sizeof( buf ), stdin );
|
||||
len = strlen( buf ) - 1;
|
||||
if ( len >= 0 && buf[ len ] == '\n' ) {
|
||||
buf[ len ] = '\0';
|
||||
}
|
||||
str = buf;
|
||||
strin = buf;
|
||||
} else {
|
||||
str = argv[1];
|
||||
strin = argv[ 1 ];
|
||||
}
|
||||
|
||||
if (argc >= 3) {
|
||||
for ( i = 0; i < argc-2; i++ ) {
|
||||
if ( argc >= 3 ) {
|
||||
for ( i = 0; i < argc - 2; i++ ) {
|
||||
char *s, *e;
|
||||
for (s = argv[2+i]; s; s = e) {
|
||||
e = strchr(s, ',');
|
||||
if (e != NULL) {
|
||||
e[0] = '\0';
|
||||
for ( s = argv[ 2 + i ]; s; s = e ) {
|
||||
e = strchr( s, ',' );
|
||||
if ( e != NULL ) {
|
||||
e[ 0 ] = '\0';
|
||||
e++;
|
||||
}
|
||||
|
||||
if (!strcasecmp(s, "V3")) {
|
||||
flags[i] |= LDAP_DN_FORMAT_LDAPV3;
|
||||
} else if (!strcasecmp(s, "V2")) {
|
||||
flags[i] |= LDAP_DN_FORMAT_LDAPV2;
|
||||
} else if (!strcasecmp(s, "DCE")) {
|
||||
flags[i] |= LDAP_DN_FORMAT_DCE;
|
||||
} else if (!strcasecmp(s, "UFN")) {
|
||||
flags[i] |= LDAP_DN_FORMAT_UFN;
|
||||
} else if (!strcasecmp(s, "AD")) {
|
||||
flags[i] |= LDAP_DN_FORMAT_AD_CANONICAL;
|
||||
} else if (!strcasecmp(s, "PEDANTIC")) {
|
||||
flags[i] |= LDAP_DN_PEDANTIC;
|
||||
if ( !strcasecmp( s, "V3" ) ) {
|
||||
flags[ i ] |= LDAP_DN_FORMAT_LDAPV3;
|
||||
} else if ( !strcasecmp( s, "V2" ) ) {
|
||||
flags[ i ] |= LDAP_DN_FORMAT_LDAPV2;
|
||||
} else if ( !strcasecmp( s, "DCE" ) ) {
|
||||
flags[ i ] |= LDAP_DN_FORMAT_DCE;
|
||||
} else if ( !strcasecmp( s, "UFN" ) ) {
|
||||
flags[ i ] |= LDAP_DN_FORMAT_UFN;
|
||||
} else if ( !strcasecmp( s, "AD" ) ) {
|
||||
flags[ i ] |= LDAP_DN_FORMAT_AD_CANONICAL;
|
||||
} else if ( !strcasecmp( s, "PEDANTIC" ) ) {
|
||||
flags[ i ] |= LDAP_DN_PEDANTIC;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
rc = ldap_str2dn(str, &dn, flags[0]);
|
||||
|
||||
f2 = argc > 3 ? 1 : 0;
|
||||
|
||||
rc = ldap_str2dn( strin, &dn, flags[ 0 ] );
|
||||
|
||||
if ( rc == LDAP_SUCCESS &&
|
||||
ldap_dn2str( dn, &str, flags[argc > 3 ? 1 : 0] )
|
||||
== LDAP_SUCCESS ) {
|
||||
fprintf( stdout, "%s\n", str );
|
||||
ldap_dn2str( dn, &str, flags[ f2 ] ) == LDAP_SUCCESS ) {
|
||||
char **values, *tmp, *tmp2;
|
||||
int n;
|
||||
|
||||
switch ( flags[ f2 ] & LDAP_DN_FORMAT_MASK ) {
|
||||
case LDAP_DN_FORMAT_UFN:
|
||||
case LDAP_DN_FORMAT_AD_CANONICAL:
|
||||
return( 0 );
|
||||
|
||||
case LDAP_DN_FORMAT_LDAPV3:
|
||||
case LDAP_DN_FORMAT_LDAPV2:
|
||||
fprintf( stdout, "\nldap_dn2str(ldap_str2dn(\"%s\"))\n"
|
||||
"\t=\"%s\"\n", strin, str );
|
||||
tmp = ldap_dn2ufn( strin );
|
||||
fprintf( stdout, "\nldap_dn2ufn(\"%s\")\n\t=\"%s\"\n",
|
||||
strin, tmp );
|
||||
ldap_memfree( tmp );
|
||||
tmp = ldap_dn2dcedn( strin );
|
||||
fprintf( stdout, "\nldap_dn2dcedn(\"%s\")\n"
|
||||
"\t=\"%s\"\n", strin, tmp );
|
||||
tmp2 = ldap_dcedn2dn( tmp );
|
||||
fprintf( stdout, "\nldap_dcedn2dn(\"%s\")\n"
|
||||
"\t=\"%s\"\n", tmp, tmp2 );
|
||||
ldap_memfree( tmp );
|
||||
ldap_memfree( tmp2 );
|
||||
tmp = ldap_dn2ad_canonical( strin );
|
||||
fprintf( stdout, "\nldap_dn2ad_canonical(\"%s\")\n"
|
||||
"\t=\"%s\"\n", strin, tmp );
|
||||
ldap_memfree( tmp );
|
||||
|
||||
fprintf( stdout, "\nldap_explode_dn(\"%s\"):\n", str );
|
||||
values = ldap_explode_dn( str, 0 );
|
||||
for ( n = 0; values && values[ n ]; n++ ) {
|
||||
char **vv;
|
||||
int nn;
|
||||
|
||||
fprintf( stdout, "\t\"%s\"\n", values[ n ] );
|
||||
|
||||
fprintf( stdout, "\tldap_explode_rdn(\"%s\")\n",
|
||||
values[ n ] );
|
||||
vv = ldap_explode_rdn( values[ n ], 0 );
|
||||
for ( nn = 0; vv && vv[ nn ]; nn++ ) {
|
||||
fprintf( stdout, "\t\t'%s'\n",
|
||||
vv[ nn ] );
|
||||
}
|
||||
LDAP_VFREE( vv );
|
||||
|
||||
fprintf( stdout, "\tldap_explode_rdn(\"%s\")"
|
||||
" (no types)\n", values[ n ] );
|
||||
vv = ldap_explode_rdn( values[ n ], 1 );
|
||||
for ( nn = 0; vv && vv[ nn ]; nn++ ) {
|
||||
fprintf( stdout, "\t\t\t\"%s\"\n",
|
||||
vv[ nn ] );
|
||||
}
|
||||
LDAP_VFREE( vv );
|
||||
|
||||
}
|
||||
LDAP_VFREE( values );
|
||||
|
||||
fprintf( stdout, "\nldap_explode_dn(\"%s\")"
|
||||
" (no types):\n", str );
|
||||
values = ldap_explode_dn( str, 1 );
|
||||
for ( n = 0; values && values[ n ]; n++ ) {
|
||||
fprintf( stdout, "\t\"%s\"\n", values[ n ] );
|
||||
}
|
||||
LDAP_VFREE( values );
|
||||
|
||||
break;
|
||||
}
|
||||
|
||||
rc = ldap_str2dn( str, &dn, flags[ f2 ] );
|
||||
if ( rc == LDAP_SUCCESS &&
|
||||
ldap_dn2str( dn, &str2, flags[ f2 ] )
|
||||
== LDAP_SUCCESS ) {
|
||||
fprintf( stdout, "\n\"%s\"\n\t == \"%s\" ? %s\n",
|
||||
str, str2,
|
||||
strcmp( str, str2 ) == 0 ? "yes" : "no" );
|
||||
ldap_memfree( str2 );
|
||||
}
|
||||
ldap_memfree( str );
|
||||
}
|
||||
|
||||
return 0;
|
||||
/* note: dn is not freed */
|
||||
|
||||
return( 0 );
|
||||
}
|
||||
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
Loading…
Reference in a new issue