" -a deref one of never (default), always, search, or find\n"
" -A retrieve attribute names only (no values)\n"
" -b basedn base dn for search\n"
+" -F prefix URL prefix for files (default: \"" LDAP_FILE_URI_PREFIX ")\n"
" -l limit time limit (in seconds) for search\n"
" -L print responses in LDIFv1 format\n"
" -LL print responses in LDIF format without comments\n"
" -T path write files to directory specified by path (default:\n"
" " LDAP_TMPDIR ")\n"
" -u include User Friendly entry names in the output\n"
-" -V prefix URL prefix for files (default: \"" LDAP_FILE_URI_PREFIX ")\n"
" -z limit size limit (in entries) for search\n"
"Common options:\n"
" -D binddn bind DN\n"
" -f file read operations from `file'\n"
" -h host LDAP server\n"
+" -H URI LDAP Uniform Resource Indentifier(s)\n"
" -I use SASL Interactive mode\n"
" -k use Kerberos authentication\n"
" -K like -k, but do only step 1 of the Kerberos bind\n"
" -P version procotol version (default: 3)\n"
" -Q use SASL Quiet mode\n"
" -R realm SASL realm\n"
-" -U user SASL authentication identity (username)\n"
+" -U authcid SASL authentication identity\n"
" -v run in verbose mode (diagnostics to standard output)\n"
" -w passwd bind passwd (for simple authentication)\n"
" -W prompt for bind passwd\n"
" -x Simple authentication\n"
-" -X id SASL authorization identity (\"dn:<dn>\" or \"u:<user>\")\n"
+" -X authzid SASL authorization identity (\"dn:<dn>\" or \"u:<user>\")\n"
" -Y mech SASL mechanism\n"
" -Z Start TLS request (-ZZ to require successful response)\n"
, s );
int attrsonly,
LDAPControl **sctrls,
LDAPControl **cctrls,
- struct timeval *timelimit,
+ struct timeval *timeout,
int sizelimit ));
static char *tmpdir = NULL;
static struct berval passwd = { 0, NULL };
static char *base = NULL;
static char *ldaphost = NULL;
+static char *ldapuri = NULL;
static int ldapport = 0;
#ifdef HAVE_CYRUS_SASL
static unsigned sasl_flags = LDAP_SASL_AUTOMATIC;
int
main( int argc, char **argv )
{
- char *infile, *filtpattern, **attrs, line[BUFSIZ];
+ char *infile, *filtpattern, **attrs = NULL, line[BUFSIZ];
FILE *fp = NULL;
+ FILE *log = NULL;
int rc, i, first, scope, deref, attrsonly, manageDSAit;
int referrals, timelimit, sizelimit, debug;
int authmethod, version, want_bindpw;
- LDAP *ld;
+ LDAP *ld = NULL;
infile = NULL;
debug = verbose = not = vals2tmp = referrals =
attrsonly = manageDSAit = ldif = want_bindpw = 0;
+ lutil_log_initialize(argc, argv);
+
deref = sizelimit = timelimit = version = -1;
scope = LDAP_SCOPE_SUBTREE;
authmethod = -1;
- prog = (prog = strrchr(argv[0], *LDAP_DIRSEP)) == NULL ? argv[0] : ++prog;
+ prog = (prog = strrchr(argv[0], *LDAP_DIRSEP)) == NULL ? argv[0] : prog + 1;
- while (( i = getopt( argc, argv,
- "Aa:b:f:Ll:S:s:T:tuV:z:" "Cd:D:h:IkKMnO:p:P:QRU:vw:WxX:Y:Z")) != EOF )
+ while (( i = getopt( argc, argv, "Aa:b:F:f:Ll:S:s:T:tuz:"
+ "Cd:D:h:H:IkKMnO:p:P:QR:U:vw:WxX:Y:Z")) != EOF )
{
switch( i ) {
/* Search Options */
break;
case 'f': /* input file */
if( infile != NULL ) {
- fprintf( stderr, "%s: -f previously specified\n" );
+ fprintf( stderr, "%s: -f previously specified\n", prog );
return EXIT_FAILURE;
}
infile = strdup( optarg );
break;
+ case 'F': /* uri prefix */
+ if( urlpre ) free( urlpre );
+ urlpre = strdup( optarg );
+ break;
case 'l': /* time limit */
timelimit = atoi( optarg );
+ if( timelimit < 0 ) {
+ fprintf( stderr, "%s: invalid timelimit (%d) specified\n",
+ prog, timelimit );
+ return EXIT_FAILURE;
+ }
break;
case 'L': /* print entries in LDIF format */
++ldif;
if( tmpdir ) free( tmpdir );
tmpdir = strdup( optarg );
break;
- case 'V': /* uri prefix */
- if( urlpre ) free( urlpre );
- urlpre = strdup( optarg );
- break;
case 'z': /* size limit */
sizelimit = atoi( optarg );
break;
break;
case 'D': /* bind DN */
if( binddn != NULL ) {
- fprintf( stderr, "%s: -D previously specified\n" );
+ fprintf( stderr, "%s: -D previously specified\n", prog );
return EXIT_FAILURE;
}
binddn = strdup( optarg );
break;
case 'h': /* ldap host */
+ if( ldapuri != NULL ) {
+ fprintf( stderr, "%s: -h incompatible with -H\n", prog );
+ return EXIT_FAILURE;
+ }
if( ldaphost != NULL ) {
- fprintf( stderr, "%s: -h previously specified\n" );
+ fprintf( stderr, "%s: -h previously specified\n", prog );
return EXIT_FAILURE;
}
ldaphost = strdup( optarg );
break;
+ case 'H': /* ldap URI */
+ if( ldaphost != NULL ) {
+ fprintf( stderr, "%s: -H incompatible with -h\n", prog );
+ return EXIT_FAILURE;
+ }
+ if( ldapport ) {
+ fprintf( stderr, "%s: -H incompatible with -p\n", prog );
+ return EXIT_FAILURE;
+ }
+ if( ldapuri != NULL ) {
+ fprintf( stderr, "%s: -H previously specified\n", prog );
+ return EXIT_FAILURE;
+ }
+ ldapuri = strdup( optarg );
+ break;
case 'I':
#ifdef HAVE_CYRUS_SASL
if( version == LDAP_VERSION2 ) {
case 'O':
#ifdef HAVE_CYRUS_SASL
if( sasl_secprops != NULL ) {
- fprintf( stderr, "%s: -O previously specified\n" );
+ fprintf( stderr, "%s: -O previously specified\n", prog );
return EXIT_FAILURE;
}
if( version == LDAP_VERSION2 ) {
break;
case 'p':
if( ldapport ) {
- fprintf( stderr, "%s: -p previously specified\n" );
+ fprintf( stderr, "%s: -p previously specified\n", prog );
return EXIT_FAILURE;
}
ldapport = atoi( optarg );
case 'R':
#ifdef HAVE_CYRUS_SASL
if( sasl_realm != NULL ) {
- fprintf( stderr, "%s: -R previously specified\n" );
+ fprintf( stderr, "%s: -R previously specified\n", prog );
return EXIT_FAILURE;
}
if( version == LDAP_VERSION2 ) {
case 'U':
#ifdef HAVE_CYRUS_SASL
if( sasl_authc_id != NULL ) {
- fprintf( stderr, "%s: -U previously specified\n" );
+ fprintf( stderr, "%s: -U previously specified\n", prog );
return EXIT_FAILURE;
}
if( version == LDAP_VERSION2 ) {
{
char* p;
- for( p = optarg; *p == '\0'; p++ ) {
+ for( p = optarg; *p != '\0'; p++ ) {
*p = '\0';
}
}
case 'Y':
#ifdef HAVE_CYRUS_SASL
if( sasl_mech != NULL ) {
- fprintf( stderr, "%s: -Y previously specified\n" );
+ fprintf( stderr, "%s: -Y previously specified\n", prog );
return EXIT_FAILURE;
}
if( version == LDAP_VERSION2 ) {
case 'X':
#ifdef HAVE_CYRUS_SASL
if( sasl_authz_id != NULL ) {
- fprintf( stderr, "%s: -X previously specified\n" );
+ fprintf( stderr, "%s: -X previously specified\n", prog );
return EXIT_FAILURE;
}
if( version == LDAP_VERSION2 ) {
#endif
break;
default:
- fprintf( stderr, "%s: unrecongized option -%c\n",
+ fprintf( stderr, "%s: unrecognized option -%c\n",
prog, optopt );
usage( argv[0] );
}
filtpattern = strdup( argv[optind++] );
}
- if ( argv[optind] == NULL ) {
- attrs = NULL;
- } else if ( sortattr == NULL || *sortattr == '\0' ) {
+ if ( (argv[optind] != NULL) && (sortattr == NULL || *sortattr == '\0') ) {
attrs = &argv[optind];
}
(void) SIGNAL( SIGPIPE, SIG_IGN );
#endif
- if ( verbose ) {
- fprintf( stderr,
- (ldapport ? "ldap_init( %s, %d )\n" : "ldap_init( %s, <DEFAULT> )\n"),
- (ldaphost != NULL) ? ldaphost : "<DEFAULT>",
- ldapport );
- }
+ if( ( ldaphost != NULL || ldapport ) && ( ldapuri == NULL ) ) {
+ if ( verbose ) {
+ fprintf( stderr, "ldap_init( %s, %d )\n",
+ ldaphost != NULL ? ldaphost : "<DEFAULT>",
+ ldapport );
+ }
- if (( ld = ldap_init( ldaphost, ldapport )) == NULL ) {
- perror( "ldap_init" );
- return EXIT_FAILURE;
+ ld = ldap_init( ldaphost, ldapport );
+ if( ld == NULL ) {
+ perror("ldapsearch: ldap_init");
+ return EXIT_FAILURE;
+ }
+
+ } else {
+ if ( verbose ) {
+ fprintf( stderr, "ldap_initialize( %s )\n",
+ ldapuri != NULL ? ldapuri : "<DEFAULT>" );
+ }
+
+ rc = ldap_initialize( &ld, ldapuri );
+ if( rc != LDAP_SUCCESS ) {
+ fprintf( stderr, "Could not create LDAP session handle (%d): %s\n",
+ rc, ldap_err2string(rc) );
+ return EXIT_FAILURE;
+ }
}
if (deref != -1 &&
}
if (version == -1 ) {
- version = 3;
+ version = LDAP_VERSION3;
}
if( ldap_set_option( ld, LDAP_OPT_PROTOCOL_VERSION, &version )
return EXIT_FAILURE;
}
+
if ( use_tls && ldap_start_tls_s( ld, NULL, NULL ) != LDAP_SUCCESS ) {
+ ldap_perror( ld, "ldap_start_tls" );
if ( use_tls > 1 ) {
- ldap_perror( ld, "ldap_start_tls" );
return EXIT_FAILURE;
}
- fprintf( stderr, "WARNING: could not start TLS\n" );
}
if (want_bindpw) {
c.ldctl_value.bv_len = 0;
c.ldctl_iscritical = manageDSAit > 1;
- err = ldap_set_option( ld, LDAP_OPT_SERVER_CONTROLS, &ctrls );
+ err = ldap_set_option( ld, LDAP_OPT_SERVER_CONTROLS, ctrls );
if( err != LDAP_OPT_SUCCESS ) {
fprintf( stderr, "Could not set ManageDSAit %scontrol\n",
}
if (ldif < 2 ) {
- printf( "#\n# filter%s: %s\n# requesting: ",
+ printf( "#\n# LDAPv%d\n# filter%s: %s\n# requesting: ",
+ version,
infile != NULL ? " pattern" : "",
filtpattern );
int attrsonly,
LDAPControl **sctrls,
LDAPControl **cctrls,
- struct timeval *timelimit,
+ struct timeval *timeout,
int sizelimit )
{
char filter[ BUFSIZ ];
- int rc, first;
+ int rc;
int nresponses;
int nentries;
int nreferences;
}
rc = ldap_search_ext( ld, base, scope, filter, attrs, attrsonly,
- sctrls, cctrls, timelimit, sizelimit, &msgid );
+ sctrls, cctrls, timeout, sizelimit, &msgid );
if( rc != LDAP_SUCCESS ) {
fprintf( stderr, "%s: ldap_search_ext: %s (%d)\n",
LDAP *ld,
LDAPMessage *result, int search )
{
- char rst[BUFSIZ];
int rc;
int err;
char *matcheddn = NULL;
return err;
}
-void print_ctrls( LDAPControl **ctrls ) {
+static void print_ctrls(
+ LDAPControl **ctrls )
+{
int i;
for(i=0; ctrls[i] != NULL; i++ ) {
/* control: OID criticality base64value */
projects / openldap / blobdiff