mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2024-12-21 03:10:25 +08:00
Code Issues Packages Projects Releases Wiki Activity
aab546e567
openldap/clients/tools/ldapsearch.c

698 lines
16 KiB
C
Raw Normal View History

Add OpenLDAP RCSid to *.[ch] in clients, libraries, and servers. Replace old Id as needed (back-tcl). Leave updating of contribWare to contributors (for now).
1999-09-09 03:06:24 +08:00
/* $OpenLDAP$ */
Add copyright notices.
1999-08-05 07:55:45 +08:00
/*
* Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
* COPYING RESTRICTIONS APPLY, see COPYRIGHT file
*/
merged with autoconf branch
1998-10-25 09:41:42 +08:00
#include "portable.h"
Initial revision
1998-08-09 08:43:13 +08:00
#include <stdio.h>
s/<stdlib.h>/<ac/stdlib.h>/
1999-06-03 08:37:44 +08:00
#include <ac/stdlib.h>
merged with autoconf branch
1998-10-25 09:41:42 +08:00
Use "generic" ac headers.
1998-11-15 14:54:30 +08:00
#include <ac/ctype.h>
ignore SIGPIPE
1999-01-21 06:01:14 +08:00
#include <ac/signal.h>
merged with autoconf branch
1998-10-25 09:41:42 +08:00
#include <ac/string.h>
#include <ac/unistd.h>
Fixed ldapconfig.h.edit/Make-template to generate ldapconfig.h correctly. ldif2ldbm.c defaults moved to ldapconfig.h, sed no longer needed. Changed type of lconn_lastused to time_t. Added include <time.h> were needed.
1998-08-20 10:18:28 +08:00
Initial revision
1998-08-09 08:43:13 +08:00
#include <ldap.h>
s/exit(1)/exit(EXIT_FAILURE)/ s/exit(0)/exit(EXIT_SUCCESS)/ add <ac/stdlib.h> where needed and other minor header adjustments
1999-08-04 02:14:24 +08:00
#include "ldif.h"
Enhance LDIF handling ldapsearch: use draft guidelines for determining when to use -t only writes binary attributes to files -tt writes all attributes to files output now lists URL instead of path to such files -T dir can be used to specify directory to create temp files in -V urlprefix can be used to change the URL prefix LDIF is now commented (can be disabled using -LL) LDIF now contains version attribute (can be disabled with -LLL) LDIF: put interface changed to allow caller to specify how to encode put interface uses draft guidelines for determine when to base64 encode wrapping kludged to match old off by one bug Tests: removed trailing space from some attributes (to avoid base64 encoding) enabled -LLL in defines.sh (should sed output to remove wrapping/comments/redundant separators) Misc: updated codes outputting LDIF to use new put interface TODO: handling of version attribute on input handling of URLs on input (ie: fetch URL)
1999-07-31 07:00:02 +08:00
#include "ldap_defaults.h"
Initial revision
1998-08-09 08:43:13 +08:00
Enhance LDIF handling ldapsearch: use draft guidelines for determining when to use -t only writes binary attributes to files -tt writes all attributes to files output now lists URL instead of path to such files -T dir can be used to specify directory to create temp files in -V urlprefix can be used to change the URL prefix LDIF is now commented (can be disabled using -LL) LDIF now contains version attribute (can be disabled with -LLL) LDIF: put interface changed to allow caller to specify how to encode put interface uses draft guidelines for determine when to base64 encode wrapping kludged to match old off by one bug Tests: removed trailing space from some attributes (to avoid base64 encoding) enabled -LLL in defines.sh (should sed output to remove wrapping/comments/redundant separators) Misc: updated codes outputting LDIF to use new put interface TODO: handling of version attribute on input handling of URLs on input (ie: fetch URL)
1999-07-31 07:00:02 +08:00
#define DEFSEP "="
Backout previous changes made by Dave as they excessive reformatting, reindentation, and use of spaces instead of tab. Diffs will be reviewed to identify and commit only functional changes as time permits. Note: this is more my fault than Dave's. I should have provided clearer guidance. Live and learn.
1998-12-14 18:10:41 +08:00
Protoized, moved extern definitions to .h files, fixed related bugs. Most function and variable definitions are now preceded by its extern definition, for error checking. Retyped a number of functions, usually to return void. Fixed a number of printf format errors. API changes (in ldap/include): Added avl_dup_ok, avl_prefixapply, removed ber_fatten (probably typo for ber_flatten), retyped ldap_sort_strcasecmp, grew lutil.h. A number of `extern' declarations are left (some added by protoize), to be cleaned away later. Mostly strdup(), strcasecmp(), mktemp(), optind, optarg, errno.
1998-11-16 06:40:11 +08:00
static void
Cleanup: Fix printf formats, remove unused variables, add missing prototypes in slapd, add static/const, add some return types or change to void return type.
1999-09-02 16:05:17 +08:00
usage( const char *s )
Initial revision
1998-08-09 08:43:13 +08:00
{
Enhance LDIF handling ldapsearch: use draft guidelines for determining when to use -t only writes binary attributes to files -tt writes all attributes to files output now lists URL instead of path to such files -T dir can be used to specify directory to create temp files in -V urlprefix can be used to change the URL prefix LDIF is now commented (can be disabled using -LL) LDIF now contains version attribute (can be disabled with -LLL) LDIF: put interface changed to allow caller to specify how to encode put interface uses draft guidelines for determine when to base64 encode wrapping kludged to match old off by one bug Tests: removed trailing space from some attributes (to avoid base64 encoding) enabled -LLL in defines.sh (should sed output to remove wrapping/comments/redundant separators) Misc: updated codes outputting LDIF to use new put interface TODO: handling of version attribute on input handling of URLs on input (ie: fetch URL)
1999-07-31 07:00:02 +08:00
fprintf( stderr,
"usage: %s [options] filter [attributes...]\nwhere:\n"
" filter\tRFC-1558 compliant LDAP search filter\n"
" attributes\twhitespace-separated list of attributes to retrieve\n"
"\t\t1.1 -- no attributes\n"
"\t\t* -- all user attributes\n"
"\t\t+ -- all operational attributes\n"
"\t\tempty list -- all non-operational attributes\n"
"options:\n"
" -n\t\tshow what would be done but don't actually search\n"
" -v\t\trun in verbose mode (diagnostics to standard output)\n"
" -t\t\twrite binary values to files in TMPDIR\n"
" -tt\t\twrite all values to files in TMPDIR\n"
" -T path\twrite files to directory specified by path (default: \"/tmp\")\n"
" -V prefix\tURL prefix for files (default: \"file://tmp/\"\n"
" -u\t\tinclude User Friendly entry names in the output\n"
" -A\t\tretrieve attribute names only (no values)\n"
" -B\t\tdo not suppress printing of binary values\n"
" -F sep\tprint `sep' instead of `=' between attribute names and values\n"
" -L\t\tprint entries in LDIF format (implies -B)\n"
" -LL\t\tprint entries in LDIF format without comments\n"
" -LLL\t\tprint entries in LDIF format without comments and version\n"
" -M\t\tenable Manage DSA IT control (-MM to make critical)\n"
" -R\t\tdo not automatically follow referrals\n"
" -S attr\tsort the results by attribute `attr'\n"
" -d level\tset LDAP debugging level to `level'\n"
" -f file\tperform sequence of searches listed in `file'\n"
" -b basedn\tbase dn for search\n"
" -s scope\tone of base, one, or sub (search scope)\n"
" -a deref\tone of never, always, search, or find (alias dereferencing)\n"
" -l limit\ttime limit (in seconds) for search\n"
" -z limit\tsize limit (in entries) for search\n"
" -D binddn\tbind dn\n"
" -w passwd\tbind passwd (for simple authentication)\n"
" -W\t\tprompt for bind passwd\n"
merged with autoconf branch
1998-10-25 09:41:42 +08:00
#ifdef HAVE_KERBEROS
Enhance LDIF handling ldapsearch: use draft guidelines for determining when to use -t only writes binary attributes to files -tt writes all attributes to files output now lists URL instead of path to such files -T dir can be used to specify directory to create temp files in -V urlprefix can be used to change the URL prefix LDIF is now commented (can be disabled using -LL) LDIF now contains version attribute (can be disabled with -LLL) LDIF: put interface changed to allow caller to specify how to encode put interface uses draft guidelines for determine when to base64 encode wrapping kludged to match old off by one bug Tests: removed trailing space from some attributes (to avoid base64 encoding) enabled -LLL in defines.sh (should sed output to remove wrapping/comments/redundant separators) Misc: updated codes outputting LDIF to use new put interface TODO: handling of version attribute on input handling of URLs on input (ie: fetch URL)
1999-07-31 07:00:02 +08:00
" -k\t\tuse Kerberos instead of Simple Password authentication\n"
Initial revision
1998-08-09 08:43:13 +08:00
#endif
Enhance LDIF handling ldapsearch: use draft guidelines for determining when to use -t only writes binary attributes to files -tt writes all attributes to files output now lists URL instead of path to such files -T dir can be used to specify directory to create temp files in -V urlprefix can be used to change the URL prefix LDIF is now commented (can be disabled using -LL) LDIF now contains version attribute (can be disabled with -LLL) LDIF: put interface changed to allow caller to specify how to encode put interface uses draft guidelines for determine when to base64 encode wrapping kludged to match old off by one bug Tests: removed trailing space from some attributes (to avoid base64 encoding) enabled -LLL in defines.sh (should sed output to remove wrapping/comments/redundant separators) Misc: updated codes outputting LDIF to use new put interface TODO: handling of version attribute on input handling of URLs on input (ie: fetch URL)
1999-07-31 07:00:02 +08:00
" -h host\tldap server\n"
" -p port\tport on ldap server\n"
" -P version\tprocotol version (2 or 3)\n"
, s );
exit( EXIT_FAILURE );
Initial revision
1998-08-09 08:43:13 +08:00
}
merged with autoconf branch
1998-10-25 09:41:42 +08:00
static void print_entry LDAP_P((
Enhance LDIF handling ldapsearch: use draft guidelines for determining when to use -t only writes binary attributes to files -tt writes all attributes to files output now lists URL instead of path to such files -T dir can be used to specify directory to create temp files in -V urlprefix can be used to change the URL prefix LDIF is now commented (can be disabled using -LL) LDIF now contains version attribute (can be disabled with -LLL) LDIF: put interface changed to allow caller to specify how to encode put interface uses draft guidelines for determine when to base64 encode wrapping kludged to match old off by one bug Tests: removed trailing space from some attributes (to avoid base64 encoding) enabled -LLL in defines.sh (should sed output to remove wrapping/comments/redundant separators) Misc: updated codes outputting LDIF to use new put interface TODO: handling of version attribute on input handling of URLs on input (ie: fetch URL)
1999-07-31 07:00:02 +08:00
LDAP *ld,
LDAPMessage *entry,
int attrsonly));
merged with autoconf branch
1998-10-25 09:41:42 +08:00
Enhance LDIF handling ldapsearch: use draft guidelines for determining when to use -t only writes binary attributes to files -tt writes all attributes to files output now lists URL instead of path to such files -T dir can be used to specify directory to create temp files in -V urlprefix can be used to change the URL prefix LDIF is now commented (can be disabled using -LL) LDIF now contains version attribute (can be disabled with -LLL) LDIF: put interface changed to allow caller to specify how to encode put interface uses draft guidelines for determine when to base64 encode wrapping kludged to match old off by one bug Tests: removed trailing space from some attributes (to avoid base64 encoding) enabled -LLL in defines.sh (should sed output to remove wrapping/comments/redundant separators) Misc: updated codes outputting LDIF to use new put interface TODO: handling of version attribute on input handling of URLs on input (ie: fetch URL)
1999-07-31 07:00:02 +08:00
static int write_ldif LDAP_P((
int type,
char *name,
merged with autoconf branch
1998-10-25 09:41:42 +08:00
char *value,
Enhance LDIF handling ldapsearch: use draft guidelines for determining when to use -t only writes binary attributes to files -tt writes all attributes to files output now lists URL instead of path to such files -T dir can be used to specify directory to create temp files in -V urlprefix can be used to change the URL prefix LDIF is now commented (can be disabled using -LL) LDIF now contains version attribute (can be disabled with -LLL) LDIF: put interface changed to allow caller to specify how to encode put interface uses draft guidelines for determine when to base64 encode wrapping kludged to match old off by one bug Tests: removed trailing space from some attributes (to avoid base64 encoding) enabled -LLL in defines.sh (should sed output to remove wrapping/comments/redundant separators) Misc: updated codes outputting LDIF to use new put interface TODO: handling of version attribute on input handling of URLs on input (ie: fetch URL)
1999-07-31 07:00:02 +08:00
ber_len_t vallen ));
merged with autoconf branch
1998-10-25 09:41:42 +08:00
static int dosearch LDAP_P((
LDAP *ld,
Enhance LDIF handling ldapsearch: use draft guidelines for determining when to use -t only writes binary attributes to files -tt writes all attributes to files output now lists URL instead of path to such files -T dir can be used to specify directory to create temp files in -V urlprefix can be used to change the URL prefix LDIF is now commented (can be disabled using -LL) LDIF now contains version attribute (can be disabled with -LLL) LDIF: put interface changed to allow caller to specify how to encode put interface uses draft guidelines for determine when to base64 encode wrapping kludged to match old off by one bug Tests: removed trailing space from some attributes (to avoid base64 encoding) enabled -LLL in defines.sh (should sed output to remove wrapping/comments/redundant separators) Misc: updated codes outputting LDIF to use new put interface TODO: handling of version attribute on input handling of URLs on input (ie: fetch URL)
1999-07-31 07:00:02 +08:00
char *base,
int scope,
char **attrs,
int attrsonly,
char *filtpatt,
char *value));
#define TMPDIR "/tmp"
#define URLPRE "file:/tmp/"
static char *tmpdir = NULL;
static char *urlpre = NULL;
merged with autoconf branch
1998-10-25 09:41:42 +08:00
Backout previous changes made by Dave as they excessive reformatting, reindentation, and use of spaces instead of tab. Diffs will be reviewed to identify and commit only functional changes as time permits. Note: this is more my fault than Dave's. I should have provided clearer guidance. Live and learn.
1998-12-14 18:10:41 +08:00
static char *binddn = NULL;
static char *passwd = NULL;
static char *base = NULL;
static char *ldaphost = NULL;
static int ldapport = 0;
static char *sep = DEFSEP;
static char *sortattr = NULL;
Initial revision
1998-08-09 08:43:13 +08:00
static int skipsortattr = 0;
Enhance LDIF handling ldapsearch: use draft guidelines for determining when to use -t only writes binary attributes to files -tt writes all attributes to files output now lists URL instead of path to such files -T dir can be used to specify directory to create temp files in -V urlprefix can be used to change the URL prefix LDIF is now commented (can be disabled using -LL) LDIF now contains version attribute (can be disabled with -LLL) LDIF: put interface changed to allow caller to specify how to encode put interface uses draft guidelines for determine when to base64 encode wrapping kludged to match old off by one bug Tests: removed trailing space from some attributes (to avoid base64 encoding) enabled -LLL in defines.sh (should sed output to remove wrapping/comments/redundant separators) Misc: updated codes outputting LDIF to use new put interface TODO: handling of version attribute on input handling of URLs on input (ie: fetch URL)
1999-07-31 07:00:02 +08:00
static int verbose, not, includeufn, binary, vals2tmp, ldif;
Initial revision
1998-08-09 08:43:13 +08:00
Some gcc -W cleanup
1998-11-04 21:15:18 +08:00
int
Backout previous changes made by Dave as they excessive reformatting, reindentation, and use of spaces instead of tab. Diffs will be reviewed to identify and commit only functional changes as time permits. Note: this is more my fault than Dave's. I should have provided clearer guidance. Live and learn.
1998-12-14 18:10:41 +08:00
main( int argc, char **argv )
Initial revision
1998-08-09 08:43:13 +08:00
{
Enhance LDIF handling ldapsearch: use draft guidelines for determining when to use -t only writes binary attributes to files -tt writes all attributes to files output now lists URL instead of path to such files -T dir can be used to specify directory to create temp files in -V urlprefix can be used to change the URL prefix LDIF is now commented (can be disabled using -LL) LDIF now contains version attribute (can be disabled with -LLL) LDIF: put interface changed to allow caller to specify how to encode put interface uses draft guidelines for determine when to base64 encode wrapping kludged to match old off by one bug Tests: removed trailing space from some attributes (to avoid base64 encoding) enabled -LLL in defines.sh (should sed output to remove wrapping/comments/redundant separators) Misc: updated codes outputting LDIF to use new put interface TODO: handling of version attribute on input handling of URLs on input (ie: fetch URL)
1999-07-31 07:00:02 +08:00
char *infile, *filtpattern, **attrs, line[ BUFSIZ ];
FILE *fp;
int rc, i, first, scope, deref, attrsonly, manageDSAit;
int referrals, timelimit, sizelimit, debug;
Add support for -P protocol_version.
1998-12-27 22:08:46 +08:00
int authmethod, version, want_bindpw;
Enhance LDIF handling ldapsearch: use draft guidelines for determining when to use -t only writes binary attributes to files -tt writes all attributes to files output now lists URL instead of path to such files -T dir can be used to specify directory to create temp files in -V urlprefix can be used to change the URL prefix LDIF is now commented (can be disabled using -LL) LDIF now contains version attribute (can be disabled with -LLL) LDIF: put interface changed to allow caller to specify how to encode put interface uses draft guidelines for determine when to base64 encode wrapping kludged to match old off by one bug Tests: removed trailing space from some attributes (to avoid base64 encoding) enabled -LLL in defines.sh (should sed output to remove wrapping/comments/redundant separators) Misc: updated codes outputting LDIF to use new put interface TODO: handling of version attribute on input handling of URLs on input (ie: fetch URL)
1999-07-31 07:00:02 +08:00
LDAP *ld;
Backout previous changes made by Dave as they excessive reformatting, reindentation, and use of spaces instead of tab. Diffs will be reviewed to identify and commit only functional changes as time permits. Note: this is more my fault than Dave's. I should have provided clearer guidance. Live and learn.
1998-12-14 18:10:41 +08:00
Enhance LDIF handling ldapsearch: use draft guidelines for determining when to use -t only writes binary attributes to files -tt writes all attributes to files output now lists URL instead of path to such files -T dir can be used to specify directory to create temp files in -V urlprefix can be used to change the URL prefix LDIF is now commented (can be disabled using -LL) LDIF now contains version attribute (can be disabled with -LLL) LDIF: put interface changed to allow caller to specify how to encode put interface uses draft guidelines for determine when to base64 encode wrapping kludged to match old off by one bug Tests: removed trailing space from some attributes (to avoid base64 encoding) enabled -LLL in defines.sh (should sed output to remove wrapping/comments/redundant separators) Misc: updated codes outputting LDIF to use new put interface TODO: handling of version attribute on input handling of URLs on input (ie: fetch URL)
1999-07-31 07:00:02 +08:00
infile = NULL;
debug = verbose = binary = not = vals2tmp =
attrsonly = manageDSAit = ldif = want_bindpw = 0;
Make ldap_set_option options optional.
1998-12-29 13:33:34 +08:00
Should have left 'scope' alone.
1998-12-29 13:44:18 +08:00
deref = referrals = sizelimit = timelimit = version = -1;
Make ldap_set_option options optional.
1998-12-29 13:33:34 +08:00
Should have left 'scope' alone.
1998-12-29 13:44:18 +08:00
scope = LDAP_SCOPE_SUBTREE;
Enhance LDIF handling ldapsearch: use draft guidelines for determining when to use -t only writes binary attributes to files -tt writes all attributes to files output now lists URL instead of path to such files -T dir can be used to specify directory to create temp files in -V urlprefix can be used to change the URL prefix LDIF is now commented (can be disabled using -LL) LDIF now contains version attribute (can be disabled with -LLL) LDIF: put interface changed to allow caller to specify how to encode put interface uses draft guidelines for determine when to base64 encode wrapping kludged to match old off by one bug Tests: removed trailing space from some attributes (to avoid base64 encoding) enabled -LLL in defines.sh (should sed output to remove wrapping/comments/redundant separators) Misc: updated codes outputting LDIF to use new put interface TODO: handling of version attribute on input handling of URLs on input (ie: fetch URL)
1999-07-31 07:00:02 +08:00
authmethod = LDAP_AUTH_SIMPLE;
Initial revision
1998-08-09 08:43:13 +08:00
Enhance LDIF handling ldapsearch: use draft guidelines for determining when to use -t only writes binary attributes to files -tt writes all attributes to files output now lists URL instead of path to such files -T dir can be used to specify directory to create temp files in -V urlprefix can be used to change the URL prefix LDIF is now commented (can be disabled using -LL) LDIF now contains version attribute (can be disabled with -LLL) LDIF: put interface changed to allow caller to specify how to encode put interface uses draft guidelines for determine when to base64 encode wrapping kludged to match old off by one bug Tests: removed trailing space from some attributes (to avoid base64 encoding) enabled -LLL in defines.sh (should sed output to remove wrapping/comments/redundant separators) Misc: updated codes outputting LDIF to use new put interface TODO: handling of version attribute on input handling of URLs on input (ie: fetch URL)
1999-07-31 07:00:02 +08:00
while (( i = getopt( argc, argv,
"WKknuvtMRABLD:s:f:h:b:d:P:p:F:a:w:l:z:S:T:V:")) != EOF )
{
Backout previous changes made by Dave as they excessive reformatting, reindentation, and use of spaces instead of tab. Diffs will be reviewed to identify and commit only functional changes as time permits. Note: this is more my fault than Dave's. I should have provided clearer guidance. Live and learn.
1998-12-14 18:10:41 +08:00
switch( i ) {
case 'n': /* do Not do any searches */
Enhance LDIF handling ldapsearch: use draft guidelines for determining when to use -t only writes binary attributes to files -tt writes all attributes to files output now lists URL instead of path to such files -T dir can be used to specify directory to create temp files in -V urlprefix can be used to change the URL prefix LDIF is now commented (can be disabled using -LL) LDIF now contains version attribute (can be disabled with -LLL) LDIF: put interface changed to allow caller to specify how to encode put interface uses draft guidelines for determine when to base64 encode wrapping kludged to match old off by one bug Tests: removed trailing space from some attributes (to avoid base64 encoding) enabled -LLL in defines.sh (should sed output to remove wrapping/comments/redundant separators) Misc: updated codes outputting LDIF to use new put interface TODO: handling of version attribute on input handling of URLs on input (ie: fetch URL)
1999-07-31 07:00:02 +08:00
++not;
break;
Backout previous changes made by Dave as they excessive reformatting, reindentation, and use of spaces instead of tab. Diffs will be reviewed to identify and commit only functional changes as time permits. Note: this is more my fault than Dave's. I should have provided clearer guidance. Live and learn.
1998-12-14 18:10:41 +08:00
case 'v': /* verbose mode */
Enhance LDIF handling ldapsearch: use draft guidelines for determining when to use -t only writes binary attributes to files -tt writes all attributes to files output now lists URL instead of path to such files -T dir can be used to specify directory to create temp files in -V urlprefix can be used to change the URL prefix LDIF is now commented (can be disabled using -LL) LDIF now contains version attribute (can be disabled with -LLL) LDIF: put interface changed to allow caller to specify how to encode put interface uses draft guidelines for determine when to base64 encode wrapping kludged to match old off by one bug Tests: removed trailing space from some attributes (to avoid base64 encoding) enabled -LLL in defines.sh (should sed output to remove wrapping/comments/redundant separators) Misc: updated codes outputting LDIF to use new put interface TODO: handling of version attribute on input handling of URLs on input (ie: fetch URL)
1999-07-31 07:00:02 +08:00
++verbose;
break;
Initial revision
1998-08-09 08:43:13 +08:00
case 'd':
Enhance LDIF handling ldapsearch: use draft guidelines for determining when to use -t only writes binary attributes to files -tt writes all attributes to files output now lists URL instead of path to such files -T dir can be used to specify directory to create temp files in -V urlprefix can be used to change the URL prefix LDIF is now commented (can be disabled using -LL) LDIF now contains version attribute (can be disabled with -LLL) LDIF: put interface changed to allow caller to specify how to encode put interface uses draft guidelines for determine when to base64 encode wrapping kludged to match old off by one bug Tests: removed trailing space from some attributes (to avoid base64 encoding) enabled -LLL in defines.sh (should sed output to remove wrapping/comments/redundant separators) Misc: updated codes outputting LDIF to use new put interface TODO: handling of version attribute on input handling of URLs on input (ie: fetch URL)
1999-07-31 07:00:02 +08:00
debug |= atoi( optarg );
break;
Backout previous changes made by Dave as they excessive reformatting, reindentation, and use of spaces instead of tab. Diffs will be reviewed to identify and commit only functional changes as time permits. Note: this is more my fault than Dave's. I should have provided clearer guidance. Live and learn.
1998-12-14 18:10:41 +08:00
case 'k': /* use kerberos bind */
Streamlined Kerberos Code.
1998-12-15 04:39:02 +08:00
#ifdef HAVE_KERBEROS
authmethod = LDAP_AUTH_KRBV4;
#else
fprintf (stderr, "%s was not compiled with Kerberos support\n", argv[0]);
#endif
Enhance LDIF handling ldapsearch: use draft guidelines for determining when to use -t only writes binary attributes to files -tt writes all attributes to files output now lists URL instead of path to such files -T dir can be used to specify directory to create temp files in -V urlprefix can be used to change the URL prefix LDIF is now commented (can be disabled using -LL) LDIF now contains version attribute (can be disabled with -LLL) LDIF: put interface changed to allow caller to specify how to encode put interface uses draft guidelines for determine when to base64 encode wrapping kludged to match old off by one bug Tests: removed trailing space from some attributes (to avoid base64 encoding) enabled -LLL in defines.sh (should sed output to remove wrapping/comments/redundant separators) Misc: updated codes outputting LDIF to use new put interface TODO: handling of version attribute on input handling of URLs on input (ie: fetch URL)
1999-07-31 07:00:02 +08:00
break;
Initial revision
1998-08-09 08:43:13 +08:00
case 'K': /* use kerberos bind, 1st part only */
Streamlined Kerberos Code.
1998-12-15 04:39:02 +08:00
#ifdef HAVE_KERBEROS
authmethod = LDAP_AUTH_KRBV41;
#else
fprintf (stderr, "%s was not compiled with Kerberos support\n", argv[0]);
Initial revision
1998-08-09 08:43:13 +08:00
#endif
Enhance LDIF handling ldapsearch: use draft guidelines for determining when to use -t only writes binary attributes to files -tt writes all attributes to files output now lists URL instead of path to such files -T dir can be used to specify directory to create temp files in -V urlprefix can be used to change the URL prefix LDIF is now commented (can be disabled using -LL) LDIF now contains version attribute (can be disabled with -LLL) LDIF: put interface changed to allow caller to specify how to encode put interface uses draft guidelines for determine when to base64 encode wrapping kludged to match old off by one bug Tests: removed trailing space from some attributes (to avoid base64 encoding) enabled -LLL in defines.sh (should sed output to remove wrapping/comments/redundant separators) Misc: updated codes outputting LDIF to use new put interface TODO: handling of version attribute on input handling of URLs on input (ie: fetch URL)
1999-07-31 07:00:02 +08:00
break;
Backout previous changes made by Dave as they excessive reformatting, reindentation, and use of spaces instead of tab. Diffs will be reviewed to identify and commit only functional changes as time permits. Note: this is more my fault than Dave's. I should have provided clearer guidance. Live and learn.
1998-12-14 18:10:41 +08:00
case 'u': /* include UFN */
Enhance LDIF handling ldapsearch: use draft guidelines for determining when to use -t only writes binary attributes to files -tt writes all attributes to files output now lists URL instead of path to such files -T dir can be used to specify directory to create temp files in -V urlprefix can be used to change the URL prefix LDIF is now commented (can be disabled using -LL) LDIF now contains version attribute (can be disabled with -LLL) LDIF: put interface changed to allow caller to specify how to encode put interface uses draft guidelines for determine when to base64 encode wrapping kludged to match old off by one bug Tests: removed trailing space from some attributes (to avoid base64 encoding) enabled -LLL in defines.sh (should sed output to remove wrapping/comments/redundant separators) Misc: updated codes outputting LDIF to use new put interface TODO: handling of version attribute on input handling of URLs on input (ie: fetch URL)
1999-07-31 07:00:02 +08:00
++includeufn;
break;
Backout previous changes made by Dave as they excessive reformatting, reindentation, and use of spaces instead of tab. Diffs will be reviewed to identify and commit only functional changes as time permits. Note: this is more my fault than Dave's. I should have provided clearer guidance. Live and learn.
1998-12-14 18:10:41 +08:00
case 't': /* write attribute values to /tmp files */
Enhance LDIF handling ldapsearch: use draft guidelines for determining when to use -t only writes binary attributes to files -tt writes all attributes to files output now lists URL instead of path to such files -T dir can be used to specify directory to create temp files in -V urlprefix can be used to change the URL prefix LDIF is now commented (can be disabled using -LL) LDIF now contains version attribute (can be disabled with -LLL) LDIF: put interface changed to allow caller to specify how to encode put interface uses draft guidelines for determine when to base64 encode wrapping kludged to match old off by one bug Tests: removed trailing space from some attributes (to avoid base64 encoding) enabled -LLL in defines.sh (should sed output to remove wrapping/comments/redundant separators) Misc: updated codes outputting LDIF to use new put interface TODO: handling of version attribute on input handling of URLs on input (ie: fetch URL)
1999-07-31 07:00:02 +08:00
++vals2tmp;
break;
Import experimental referral implementation from OPENLDAP_DEVEL_REFERRALS. Includes support for update referral for each replicated backend. Reworked replication test to use update referral. Includes major rewrite of response encoding codes (result.c). Includes reworked alias support and eliminates old suffix alias codes (can be emulated using named alias). Includes (untested) support for the Manage DSA IT control. Works in LDAPv2 world. Still testing in LDAPv3 world. Added default referral (test009) test.
1999-07-16 10:45:46 +08:00
case 'M':
/* enable Manage DSA IT */
manageDSAit++;
break;
Backout previous changes made by Dave as they excessive reformatting, reindentation, and use of spaces instead of tab. Diffs will be reviewed to identify and commit only functional changes as time permits. Note: this is more my fault than Dave's. I should have provided clearer guidance. Live and learn.
1998-12-14 18:10:41 +08:00
case 'R': /* don't automatically chase referrals */
referrals = (int) LDAP_OPT_OFF;
Enhance LDIF handling ldapsearch: use draft guidelines for determining when to use -t only writes binary attributes to files -tt writes all attributes to files output now lists URL instead of path to such files -T dir can be used to specify directory to create temp files in -V urlprefix can be used to change the URL prefix LDIF is now commented (can be disabled using -LL) LDIF now contains version attribute (can be disabled with -LLL) LDIF: put interface changed to allow caller to specify how to encode put interface uses draft guidelines for determine when to base64 encode wrapping kludged to match old off by one bug Tests: removed trailing space from some attributes (to avoid base64 encoding) enabled -LLL in defines.sh (should sed output to remove wrapping/comments/redundant separators) Misc: updated codes outputting LDIF to use new put interface TODO: handling of version attribute on input handling of URLs on input (ie: fetch URL)
1999-07-31 07:00:02 +08:00
break;
Backout previous changes made by Dave as they excessive reformatting, reindentation, and use of spaces instead of tab. Diffs will be reviewed to identify and commit only functional changes as time permits. Note: this is more my fault than Dave's. I should have provided clearer guidance. Live and learn.
1998-12-14 18:10:41 +08:00
case 'A': /* retrieve attribute names only -- no values */
Enhance LDIF handling ldapsearch: use draft guidelines for determining when to use -t only writes binary attributes to files -tt writes all attributes to files output now lists URL instead of path to such files -T dir can be used to specify directory to create temp files in -V urlprefix can be used to change the URL prefix LDIF is now commented (can be disabled using -LL) LDIF now contains version attribute (can be disabled with -LLL) LDIF: put interface changed to allow caller to specify how to encode put interface uses draft guidelines for determine when to base64 encode wrapping kludged to match old off by one bug Tests: removed trailing space from some attributes (to avoid base64 encoding) enabled -LLL in defines.sh (should sed output to remove wrapping/comments/redundant separators) Misc: updated codes outputting LDIF to use new put interface TODO: handling of version attribute on input handling of URLs on input (ie: fetch URL)
1999-07-31 07:00:02 +08:00
++attrsonly;
break;
Backout previous changes made by Dave as they excessive reformatting, reindentation, and use of spaces instead of tab. Diffs will be reviewed to identify and commit only functional changes as time permits. Note: this is more my fault than Dave's. I should have provided clearer guidance. Live and learn.
1998-12-14 18:10:41 +08:00
case 'L': /* print entries in LDIF format */
Enhance LDIF handling ldapsearch: use draft guidelines for determining when to use -t only writes binary attributes to files -tt writes all attributes to files output now lists URL instead of path to such files -T dir can be used to specify directory to create temp files in -V urlprefix can be used to change the URL prefix LDIF is now commented (can be disabled using -LL) LDIF now contains version attribute (can be disabled with -LLL) LDIF: put interface changed to allow caller to specify how to encode put interface uses draft guidelines for determine when to base64 encode wrapping kludged to match old off by one bug Tests: removed trailing space from some attributes (to avoid base64 encoding) enabled -LLL in defines.sh (should sed output to remove wrapping/comments/redundant separators) Misc: updated codes outputting LDIF to use new put interface TODO: handling of version attribute on input handling of URLs on input (ie: fetch URL)
1999-07-31 07:00:02 +08:00
++ldif;
/* fall through -- always allow binary when outputting LDIF */
Backout previous changes made by Dave as they excessive reformatting, reindentation, and use of spaces instead of tab. Diffs will be reviewed to identify and commit only functional changes as time permits. Note: this is more my fault than Dave's. I should have provided clearer guidance. Live and learn.
1998-12-14 18:10:41 +08:00
case 'B': /* allow binary values to be printed */
Enhance LDIF handling ldapsearch: use draft guidelines for determining when to use -t only writes binary attributes to files -tt writes all attributes to files output now lists URL instead of path to such files -T dir can be used to specify directory to create temp files in -V urlprefix can be used to change the URL prefix LDIF is now commented (can be disabled using -LL) LDIF now contains version attribute (can be disabled with -LLL) LDIF: put interface changed to allow caller to specify how to encode put interface uses draft guidelines for determine when to base64 encode wrapping kludged to match old off by one bug Tests: removed trailing space from some attributes (to avoid base64 encoding) enabled -LLL in defines.sh (should sed output to remove wrapping/comments/redundant separators) Misc: updated codes outputting LDIF to use new put interface TODO: handling of version attribute on input handling of URLs on input (ie: fetch URL)
1999-07-31 07:00:02 +08:00
++binary;
break;
Initial revision
1998-08-09 08:43:13 +08:00
case 's': /* search scope */
Enhance LDIF handling ldapsearch: use draft guidelines for determining when to use -t only writes binary attributes to files -tt writes all attributes to files output now lists URL instead of path to such files -T dir can be used to specify directory to create temp files in -V urlprefix can be used to change the URL prefix LDIF is now commented (can be disabled using -LL) LDIF now contains version attribute (can be disabled with -LLL) LDIF: put interface changed to allow caller to specify how to encode put interface uses draft guidelines for determine when to base64 encode wrapping kludged to match old off by one bug Tests: removed trailing space from some attributes (to avoid base64 encoding) enabled -LLL in defines.sh (should sed output to remove wrapping/comments/redundant separators) Misc: updated codes outputting LDIF to use new put interface TODO: handling of version attribute on input handling of URLs on input (ie: fetch URL)
1999-07-31 07:00:02 +08:00
if ( strcasecmp( optarg, "base" ) == 0 ) {
Initial revision
1998-08-09 08:43:13 +08:00
scope = LDAP_SCOPE_BASE;
Enhance LDIF handling ldapsearch: use draft guidelines for determining when to use -t only writes binary attributes to files -tt writes all attributes to files output now lists URL instead of path to such files -T dir can be used to specify directory to create temp files in -V urlprefix can be used to change the URL prefix LDIF is now commented (can be disabled using -LL) LDIF now contains version attribute (can be disabled with -LLL) LDIF: put interface changed to allow caller to specify how to encode put interface uses draft guidelines for determine when to base64 encode wrapping kludged to match old off by one bug Tests: removed trailing space from some attributes (to avoid base64 encoding) enabled -LLL in defines.sh (should sed output to remove wrapping/comments/redundant separators) Misc: updated codes outputting LDIF to use new put interface TODO: handling of version attribute on input handling of URLs on input (ie: fetch URL)
1999-07-31 07:00:02 +08:00
} else if ( strcasecmp( optarg, "one" ) == 0 ) {
Initial revision
1998-08-09 08:43:13 +08:00
scope = LDAP_SCOPE_ONELEVEL;
Enhance LDIF handling ldapsearch: use draft guidelines for determining when to use -t only writes binary attributes to files -tt writes all attributes to files output now lists URL instead of path to such files -T dir can be used to specify directory to create temp files in -V urlprefix can be used to change the URL prefix LDIF is now commented (can be disabled using -LL) LDIF now contains version attribute (can be disabled with -LLL) LDIF: put interface changed to allow caller to specify how to encode put interface uses draft guidelines for determine when to base64 encode wrapping kludged to match old off by one bug Tests: removed trailing space from some attributes (to avoid base64 encoding) enabled -LLL in defines.sh (should sed output to remove wrapping/comments/redundant separators) Misc: updated codes outputting LDIF to use new put interface TODO: handling of version attribute on input handling of URLs on input (ie: fetch URL)
1999-07-31 07:00:02 +08:00
} else if ( strcasecmp( optarg, "sub" ) == 0 ) {
Initial revision
1998-08-09 08:43:13 +08:00
scope = LDAP_SCOPE_SUBTREE;
Enhance LDIF handling ldapsearch: use draft guidelines for determining when to use -t only writes binary attributes to files -tt writes all attributes to files output now lists URL instead of path to such files -T dir can be used to specify directory to create temp files in -V urlprefix can be used to change the URL prefix LDIF is now commented (can be disabled using -LL) LDIF now contains version attribute (can be disabled with -LLL) LDIF: put interface changed to allow caller to specify how to encode put interface uses draft guidelines for determine when to base64 encode wrapping kludged to match old off by one bug Tests: removed trailing space from some attributes (to avoid base64 encoding) enabled -LLL in defines.sh (should sed output to remove wrapping/comments/redundant separators) Misc: updated codes outputting LDIF to use new put interface TODO: handling of version attribute on input handling of URLs on input (ie: fetch URL)
1999-07-31 07:00:02 +08:00
} else {
Initial revision
1998-08-09 08:43:13 +08:00
fprintf( stderr, "scope should be base, one, or sub\n" );
usage( argv[ 0 ] );
Enhance LDIF handling ldapsearch: use draft guidelines for determining when to use -t only writes binary attributes to files -tt writes all attributes to files output now lists URL instead of path to such files -T dir can be used to specify directory to create temp files in -V urlprefix can be used to change the URL prefix LDIF is now commented (can be disabled using -LL) LDIF now contains version attribute (can be disabled with -LLL) LDIF: put interface changed to allow caller to specify how to encode put interface uses draft guidelines for determine when to base64 encode wrapping kludged to match old off by one bug Tests: removed trailing space from some attributes (to avoid base64 encoding) enabled -LLL in defines.sh (should sed output to remove wrapping/comments/redundant separators) Misc: updated codes outputting LDIF to use new put interface TODO: handling of version attribute on input handling of URLs on input (ie: fetch URL)
1999-07-31 07:00:02 +08:00
}
break;
Initial revision
1998-08-09 08:43:13 +08:00
Backout previous changes made by Dave as they excessive reformatting, reindentation, and use of spaces instead of tab. Diffs will be reviewed to identify and commit only functional changes as time permits. Note: this is more my fault than Dave's. I should have provided clearer guidance. Live and learn.
1998-12-14 18:10:41 +08:00
case 'a': /* set alias deref option */
Enhance LDIF handling ldapsearch: use draft guidelines for determining when to use -t only writes binary attributes to files -tt writes all attributes to files output now lists URL instead of path to such files -T dir can be used to specify directory to create temp files in -V urlprefix can be used to change the URL prefix LDIF is now commented (can be disabled using -LL) LDIF now contains version attribute (can be disabled with -LLL) LDIF: put interface changed to allow caller to specify how to encode put interface uses draft guidelines for determine when to base64 encode wrapping kludged to match old off by one bug Tests: removed trailing space from some attributes (to avoid base64 encoding) enabled -LLL in defines.sh (should sed output to remove wrapping/comments/redundant separators) Misc: updated codes outputting LDIF to use new put interface TODO: handling of version attribute on input handling of URLs on input (ie: fetch URL)
1999-07-31 07:00:02 +08:00
if ( strcasecmp( optarg, "never" ) == 0 ) {
Backout previous changes made by Dave as they excessive reformatting, reindentation, and use of spaces instead of tab. Diffs will be reviewed to identify and commit only functional changes as time permits. Note: this is more my fault than Dave's. I should have provided clearer guidance. Live and learn.
1998-12-14 18:10:41 +08:00
deref = LDAP_DEREF_NEVER;
Enhance LDIF handling ldapsearch: use draft guidelines for determining when to use -t only writes binary attributes to files -tt writes all attributes to files output now lists URL instead of path to such files -T dir can be used to specify directory to create temp files in -V urlprefix can be used to change the URL prefix LDIF is now commented (can be disabled using -LL) LDIF now contains version attribute (can be disabled with -LLL) LDIF: put interface changed to allow caller to specify how to encode put interface uses draft guidelines for determine when to base64 encode wrapping kludged to match old off by one bug Tests: removed trailing space from some attributes (to avoid base64 encoding) enabled -LLL in defines.sh (should sed output to remove wrapping/comments/redundant separators) Misc: updated codes outputting LDIF to use new put interface TODO: handling of version attribute on input handling of URLs on input (ie: fetch URL)
1999-07-31 07:00:02 +08:00
} else if ( strcasecmp( optarg, "search" ) == 0 ) {
Backout previous changes made by Dave as they excessive reformatting, reindentation, and use of spaces instead of tab. Diffs will be reviewed to identify and commit only functional changes as time permits. Note: this is more my fault than Dave's. I should have provided clearer guidance. Live and learn.
1998-12-14 18:10:41 +08:00
deref = LDAP_DEREF_SEARCHING;
Enhance LDIF handling ldapsearch: use draft guidelines for determining when to use -t only writes binary attributes to files -tt writes all attributes to files output now lists URL instead of path to such files -T dir can be used to specify directory to create temp files in -V urlprefix can be used to change the URL prefix LDIF is now commented (can be disabled using -LL) LDIF now contains version attribute (can be disabled with -LLL) LDIF: put interface changed to allow caller to specify how to encode put interface uses draft guidelines for determine when to base64 encode wrapping kludged to match old off by one bug Tests: removed trailing space from some attributes (to avoid base64 encoding) enabled -LLL in defines.sh (should sed output to remove wrapping/comments/redundant separators) Misc: updated codes outputting LDIF to use new put interface TODO: handling of version attribute on input handling of URLs on input (ie: fetch URL)
1999-07-31 07:00:02 +08:00
} else if ( strcasecmp( optarg, "find" ) == 0 ) {
Backout previous changes made by Dave as they excessive reformatting, reindentation, and use of spaces instead of tab. Diffs will be reviewed to identify and commit only functional changes as time permits. Note: this is more my fault than Dave's. I should have provided clearer guidance. Live and learn.
1998-12-14 18:10:41 +08:00
deref = LDAP_DEREF_FINDING;
Enhance LDIF handling ldapsearch: use draft guidelines for determining when to use -t only writes binary attributes to files -tt writes all attributes to files output now lists URL instead of path to such files -T dir can be used to specify directory to create temp files in -V urlprefix can be used to change the URL prefix LDIF is now commented (can be disabled using -LL) LDIF now contains version attribute (can be disabled with -LLL) LDIF: put interface changed to allow caller to specify how to encode put interface uses draft guidelines for determine when to base64 encode wrapping kludged to match old off by one bug Tests: removed trailing space from some attributes (to avoid base64 encoding) enabled -LLL in defines.sh (should sed output to remove wrapping/comments/redundant separators) Misc: updated codes outputting LDIF to use new put interface TODO: handling of version attribute on input handling of URLs on input (ie: fetch URL)
1999-07-31 07:00:02 +08:00
} else if ( strcasecmp( optarg, "always" ) == 0 ) {
Backout previous changes made by Dave as they excessive reformatting, reindentation, and use of spaces instead of tab. Diffs will be reviewed to identify and commit only functional changes as time permits. Note: this is more my fault than Dave's. I should have provided clearer guidance. Live and learn.
1998-12-14 18:10:41 +08:00
deref = LDAP_DEREF_ALWAYS;
Enhance LDIF handling ldapsearch: use draft guidelines for determining when to use -t only writes binary attributes to files -tt writes all attributes to files output now lists URL instead of path to such files -T dir can be used to specify directory to create temp files in -V urlprefix can be used to change the URL prefix LDIF is now commented (can be disabled using -LL) LDIF now contains version attribute (can be disabled with -LLL) LDIF: put interface changed to allow caller to specify how to encode put interface uses draft guidelines for determine when to base64 encode wrapping kludged to match old off by one bug Tests: removed trailing space from some attributes (to avoid base64 encoding) enabled -LLL in defines.sh (should sed output to remove wrapping/comments/redundant separators) Misc: updated codes outputting LDIF to use new put interface TODO: handling of version attribute on input handling of URLs on input (ie: fetch URL)
1999-07-31 07:00:02 +08:00
} else {
Backout previous changes made by Dave as they excessive reformatting, reindentation, and use of spaces instead of tab. Diffs will be reviewed to identify and commit only functional changes as time permits. Note: this is more my fault than Dave's. I should have provided clearer guidance. Live and learn.
1998-12-14 18:10:41 +08:00
fprintf( stderr, "alias deref should be never, search, find, or always\n" );
usage( argv[ 0 ] );
Enhance LDIF handling ldapsearch: use draft guidelines for determining when to use -t only writes binary attributes to files -tt writes all attributes to files output now lists URL instead of path to such files -T dir can be used to specify directory to create temp files in -V urlprefix can be used to change the URL prefix LDIF is now commented (can be disabled using -LL) LDIF now contains version attribute (can be disabled with -LLL) LDIF: put interface changed to allow caller to specify how to encode put interface uses draft guidelines for determine when to base64 encode wrapping kludged to match old off by one bug Tests: removed trailing space from some attributes (to avoid base64 encoding) enabled -LLL in defines.sh (should sed output to remove wrapping/comments/redundant separators) Misc: updated codes outputting LDIF to use new put interface TODO: handling of version attribute on input handling of URLs on input (ie: fetch URL)
1999-07-31 07:00:02 +08:00
}
break;
case 'T': /* field separator */
if( tmpdir ) free( tmpdir );
tmpdir = strdup( optarg );
break;
case 'V': /* field separator */
if( urlpre ) free( urlpre );
urlpre = strdup( optarg );
break;
Backout previous changes made by Dave as they excessive reformatting, reindentation, and use of spaces instead of tab. Diffs will be reviewed to identify and commit only functional changes as time permits. Note: this is more my fault than Dave's. I should have provided clearer guidance. Live and learn.
1998-12-14 18:10:41 +08:00
case 'F': /* field separator */
Enhance LDIF handling ldapsearch: use draft guidelines for determining when to use -t only writes binary attributes to files -tt writes all attributes to files output now lists URL instead of path to such files -T dir can be used to specify directory to create temp files in -V urlprefix can be used to change the URL prefix LDIF is now commented (can be disabled using -LL) LDIF now contains version attribute (can be disabled with -LLL) LDIF: put interface changed to allow caller to specify how to encode put interface uses draft guidelines for determine when to base64 encode wrapping kludged to match old off by one bug Tests: removed trailing space from some attributes (to avoid base64 encoding) enabled -LLL in defines.sh (should sed output to remove wrapping/comments/redundant separators) Misc: updated codes outputting LDIF to use new put interface TODO: handling of version attribute on input handling of URLs on input (ie: fetch URL)
1999-07-31 07:00:02 +08:00
sep = strdup( optarg );
break;
Backout previous changes made by Dave as they excessive reformatting, reindentation, and use of spaces instead of tab. Diffs will be reviewed to identify and commit only functional changes as time permits. Note: this is more my fault than Dave's. I should have provided clearer guidance. Live and learn.
1998-12-14 18:10:41 +08:00
case 'f': /* input file */
Enhance LDIF handling ldapsearch: use draft guidelines for determining when to use -t only writes binary attributes to files -tt writes all attributes to files output now lists URL instead of path to such files -T dir can be used to specify directory to create temp files in -V urlprefix can be used to change the URL prefix LDIF is now commented (can be disabled using -LL) LDIF now contains version attribute (can be disabled with -LLL) LDIF: put interface changed to allow caller to specify how to encode put interface uses draft guidelines for determine when to base64 encode wrapping kludged to match old off by one bug Tests: removed trailing space from some attributes (to avoid base64 encoding) enabled -LLL in defines.sh (should sed output to remove wrapping/comments/redundant separators) Misc: updated codes outputting LDIF to use new put interface TODO: handling of version attribute on input handling of URLs on input (ie: fetch URL)
1999-07-31 07:00:02 +08:00
infile = strdup( optarg );
break;
Backout previous changes made by Dave as they excessive reformatting, reindentation, and use of spaces instead of tab. Diffs will be reviewed to identify and commit only functional changes as time permits. Note: this is more my fault than Dave's. I should have provided clearer guidance. Live and learn.
1998-12-14 18:10:41 +08:00
case 'h': /* ldap host */
Enhance LDIF handling ldapsearch: use draft guidelines for determining when to use -t only writes binary attributes to files -tt writes all attributes to files output now lists URL instead of path to such files -T dir can be used to specify directory to create temp files in -V urlprefix can be used to change the URL prefix LDIF is now commented (can be disabled using -LL) LDIF now contains version attribute (can be disabled with -LLL) LDIF: put interface changed to allow caller to specify how to encode put interface uses draft guidelines for determine when to base64 encode wrapping kludged to match old off by one bug Tests: removed trailing space from some attributes (to avoid base64 encoding) enabled -LLL in defines.sh (should sed output to remove wrapping/comments/redundant separators) Misc: updated codes outputting LDIF to use new put interface TODO: handling of version attribute on input handling of URLs on input (ie: fetch URL)
1999-07-31 07:00:02 +08:00
ldaphost = strdup( optarg );
break;
Backout previous changes made by Dave as they excessive reformatting, reindentation, and use of spaces instead of tab. Diffs will be reviewed to identify and commit only functional changes as time permits. Note: this is more my fault than Dave's. I should have provided clearer guidance. Live and learn.
1998-12-14 18:10:41 +08:00
case 'b': /* searchbase */
Enhance LDIF handling ldapsearch: use draft guidelines for determining when to use -t only writes binary attributes to files -tt writes all attributes to files output now lists URL instead of path to such files -T dir can be used to specify directory to create temp files in -V urlprefix can be used to change the URL prefix LDIF is now commented (can be disabled using -LL) LDIF now contains version attribute (can be disabled with -LLL) LDIF: put interface changed to allow caller to specify how to encode put interface uses draft guidelines for determine when to base64 encode wrapping kludged to match old off by one bug Tests: removed trailing space from some attributes (to avoid base64 encoding) enabled -LLL in defines.sh (should sed output to remove wrapping/comments/redundant separators) Misc: updated codes outputting LDIF to use new put interface TODO: handling of version attribute on input handling of URLs on input (ie: fetch URL)
1999-07-31 07:00:02 +08:00
base = strdup( optarg );
break;
Backout previous changes made by Dave as they excessive reformatting, reindentation, and use of spaces instead of tab. Diffs will be reviewed to identify and commit only functional changes as time permits. Note: this is more my fault than Dave's. I should have provided clearer guidance. Live and learn.
1998-12-14 18:10:41 +08:00
case 'D': /* bind DN */
Enhance LDIF handling ldapsearch: use draft guidelines for determining when to use -t only writes binary attributes to files -tt writes all attributes to files output now lists URL instead of path to such files -T dir can be used to specify directory to create temp files in -V urlprefix can be used to change the URL prefix LDIF is now commented (can be disabled using -LL) LDIF now contains version attribute (can be disabled with -LLL) LDIF: put interface changed to allow caller to specify how to encode put interface uses draft guidelines for determine when to base64 encode wrapping kludged to match old off by one bug Tests: removed trailing space from some attributes (to avoid base64 encoding) enabled -LLL in defines.sh (should sed output to remove wrapping/comments/redundant separators) Misc: updated codes outputting LDIF to use new put interface TODO: handling of version attribute on input handling of URLs on input (ie: fetch URL)
1999-07-31 07:00:02 +08:00
binddn = strdup( optarg );
break;
Backout previous changes made by Dave as they excessive reformatting, reindentation, and use of spaces instead of tab. Diffs will be reviewed to identify and commit only functional changes as time permits. Note: this is more my fault than Dave's. I should have provided clearer guidance. Live and learn.
1998-12-14 18:10:41 +08:00
case 'p': /* ldap port */
Enhance LDIF handling ldapsearch: use draft guidelines for determining when to use -t only writes binary attributes to files -tt writes all attributes to files output now lists URL instead of path to such files -T dir can be used to specify directory to create temp files in -V urlprefix can be used to change the URL prefix LDIF is now commented (can be disabled using -LL) LDIF now contains version attribute (can be disabled with -LLL) LDIF: put interface changed to allow caller to specify how to encode put interface uses draft guidelines for determine when to base64 encode wrapping kludged to match old off by one bug Tests: removed trailing space from some attributes (to avoid base64 encoding) enabled -LLL in defines.sh (should sed output to remove wrapping/comments/redundant separators) Misc: updated codes outputting LDIF to use new put interface TODO: handling of version attribute on input handling of URLs on input (ie: fetch URL)
1999-07-31 07:00:02 +08:00
ldapport = atoi( optarg );
break;
Backout previous changes made by Dave as they excessive reformatting, reindentation, and use of spaces instead of tab. Diffs will be reviewed to identify and commit only functional changes as time permits. Note: this is more my fault than Dave's. I should have provided clearer guidance. Live and learn.
1998-12-14 18:10:41 +08:00
case 'w': /* bind password */
Enhance LDIF handling ldapsearch: use draft guidelines for determining when to use -t only writes binary attributes to files -tt writes all attributes to files output now lists URL instead of path to such files -T dir can be used to specify directory to create temp files in -V urlprefix can be used to change the URL prefix LDIF is now commented (can be disabled using -LL) LDIF now contains version attribute (can be disabled with -LLL) LDIF: put interface changed to allow caller to specify how to encode put interface uses draft guidelines for determine when to base64 encode wrapping kludged to match old off by one bug Tests: removed trailing space from some attributes (to avoid base64 encoding) enabled -LLL in defines.sh (should sed output to remove wrapping/comments/redundant separators) Misc: updated codes outputting LDIF to use new put interface TODO: handling of version attribute on input handling of URLs on input (ie: fetch URL)
1999-07-31 07:00:02 +08:00
passwd = strdup( optarg );
Attempt to whip user password from command line.
1999-06-30 02:59:11 +08:00
{
char* p;
s/NULL/'\0'/ where appropriate
1999-07-01 12:39:42 +08:00
for( p = optarg; *p == '\0'; p++ ) {
*p = '*';
Attempt to whip user password from command line.
1999-06-30 02:59:11 +08:00
}
}
Enhance LDIF handling ldapsearch: use draft guidelines for determining when to use -t only writes binary attributes to files -tt writes all attributes to files output now lists URL instead of path to such files -T dir can be used to specify directory to create temp files in -V urlprefix can be used to change the URL prefix LDIF is now commented (can be disabled using -LL) LDIF now contains version attribute (can be disabled with -LLL) LDIF: put interface changed to allow caller to specify how to encode put interface uses draft guidelines for determine when to base64 encode wrapping kludged to match old off by one bug Tests: removed trailing space from some attributes (to avoid base64 encoding) enabled -LLL in defines.sh (should sed output to remove wrapping/comments/redundant separators) Misc: updated codes outputting LDIF to use new put interface TODO: handling of version attribute on input handling of URLs on input (ie: fetch URL)
1999-07-31 07:00:02 +08:00
break;
Backout previous changes made by Dave as they excessive reformatting, reindentation, and use of spaces instead of tab. Diffs will be reviewed to identify and commit only functional changes as time permits. Note: this is more my fault than Dave's. I should have provided clearer guidance. Live and learn.
1998-12-14 18:10:41 +08:00
case 'l': /* time limit */
Enhance LDIF handling ldapsearch: use draft guidelines for determining when to use -t only writes binary attributes to files -tt writes all attributes to files output now lists URL instead of path to such files -T dir can be used to specify directory to create temp files in -V urlprefix can be used to change the URL prefix LDIF is now commented (can be disabled using -LL) LDIF now contains version attribute (can be disabled with -LLL) LDIF: put interface changed to allow caller to specify how to encode put interface uses draft guidelines for determine when to base64 encode wrapping kludged to match old off by one bug Tests: removed trailing space from some attributes (to avoid base64 encoding) enabled -LLL in defines.sh (should sed output to remove wrapping/comments/redundant separators) Misc: updated codes outputting LDIF to use new put interface TODO: handling of version attribute on input handling of URLs on input (ie: fetch URL)
1999-07-31 07:00:02 +08:00
timelimit = atoi( optarg );
break;
Backout previous changes made by Dave as they excessive reformatting, reindentation, and use of spaces instead of tab. Diffs will be reviewed to identify and commit only functional changes as time permits. Note: this is more my fault than Dave's. I should have provided clearer guidance. Live and learn.
1998-12-14 18:10:41 +08:00
case 'z': /* size limit */
Enhance LDIF handling ldapsearch: use draft guidelines for determining when to use -t only writes binary attributes to files -tt writes all attributes to files output now lists URL instead of path to such files -T dir can be used to specify directory to create temp files in -V urlprefix can be used to change the URL prefix LDIF is now commented (can be disabled using -LL) LDIF now contains version attribute (can be disabled with -LLL) LDIF: put interface changed to allow caller to specify how to encode put interface uses draft guidelines for determine when to base64 encode wrapping kludged to match old off by one bug Tests: removed trailing space from some attributes (to avoid base64 encoding) enabled -LLL in defines.sh (should sed output to remove wrapping/comments/redundant separators) Misc: updated codes outputting LDIF to use new put interface TODO: handling of version attribute on input handling of URLs on input (ie: fetch URL)
1999-07-31 07:00:02 +08:00
sizelimit = atoi( optarg );
break;
Backout previous changes made by Dave as they excessive reformatting, reindentation, and use of spaces instead of tab. Diffs will be reviewed to identify and commit only functional changes as time permits. Note: this is more my fault than Dave's. I should have provided clearer guidance. Live and learn.
1998-12-14 18:10:41 +08:00
case 'S': /* sort attribute */
Enhance LDIF handling ldapsearch: use draft guidelines for determining when to use -t only writes binary attributes to files -tt writes all attributes to files output now lists URL instead of path to such files -T dir can be used to specify directory to create temp files in -V urlprefix can be used to change the URL prefix LDIF is now commented (can be disabled using -LL) LDIF now contains version attribute (can be disabled with -LLL) LDIF: put interface changed to allow caller to specify how to encode put interface uses draft guidelines for determine when to base64 encode wrapping kludged to match old off by one bug Tests: removed trailing space from some attributes (to avoid base64 encoding) enabled -LLL in defines.sh (should sed output to remove wrapping/comments/redundant separators) Misc: updated codes outputting LDIF to use new put interface TODO: handling of version attribute on input handling of URLs on input (ie: fetch URL)
1999-07-31 07:00:02 +08:00
sortattr = strdup( optarg );
break;
Added support for password prompting. (-W switch)
1998-12-15 10:00:09 +08:00
case 'W':
want_bindpw++;
break;
Add support for -P protocol_version.
1998-12-27 22:08:46 +08:00
case 'P':
Add warnings if ldap_set_option() fails. Check for ldap_set_option() error using LDAP_OPT_ERROR, not -1. (probably should check != LDAP_OPT_SUCCESS instead). Added additional usage errors. Used return(EXIT_FAILURE) instead of exit(1). Used DIRSEP instead of '/' && '\\' Moved verbose output to stderr.
1999-05-30 02:53:40 +08:00
switch( atoi( optarg ) )
Add support for -P protocol_version.
1998-12-27 22:08:46 +08:00
{
Add warnings if ldap_set_option() fails. Check for ldap_set_option() error using LDAP_OPT_ERROR, not -1. (probably should check != LDAP_OPT_SUCCESS instead). Added additional usage errors. Used return(EXIT_FAILURE) instead of exit(1). Used DIRSEP instead of '/' && '\\' Moved verbose output to stderr.
1999-05-30 02:53:40 +08:00
case 2:
Add support for -P protocol_version.
1998-12-27 22:08:46 +08:00
version = LDAP_VERSION2;
break;
Add warnings if ldap_set_option() fails. Check for ldap_set_option() error using LDAP_OPT_ERROR, not -1. (probably should check != LDAP_OPT_SUCCESS instead). Added additional usage errors. Used return(EXIT_FAILURE) instead of exit(1). Used DIRSEP instead of '/' && '\\' Moved verbose output to stderr.
1999-05-30 02:53:40 +08:00
case 3:
Add support for -P protocol_version.
1998-12-27 22:08:46 +08:00
version = LDAP_VERSION3;
break;
Add warnings if ldap_set_option() fails. Check for ldap_set_option() error using LDAP_OPT_ERROR, not -1. (probably should check != LDAP_OPT_SUCCESS instead). Added additional usage errors. Used return(EXIT_FAILURE) instead of exit(1). Used DIRSEP instead of '/' && '\\' Moved verbose output to stderr.
1999-05-30 02:53:40 +08:00
default:
fprintf( stderr, "protocol version should be 2 or 3\n" );
usage( argv[0] );
Add support for -P protocol_version.
1998-12-27 22:08:46 +08:00
}
break;
Backout previous changes made by Dave as they excessive reformatting, reindentation, and use of spaces instead of tab. Diffs will be reviewed to identify and commit only functional changes as time permits. Note: this is more my fault than Dave's. I should have provided clearer guidance. Live and learn.
1998-12-14 18:10:41 +08:00
default:
Enhance LDIF handling ldapsearch: use draft guidelines for determining when to use -t only writes binary attributes to files -tt writes all attributes to files output now lists URL instead of path to such files -T dir can be used to specify directory to create temp files in -V urlprefix can be used to change the URL prefix LDIF is now commented (can be disabled using -LL) LDIF now contains version attribute (can be disabled with -LLL) LDIF: put interface changed to allow caller to specify how to encode put interface uses draft guidelines for determine when to base64 encode wrapping kludged to match old off by one bug Tests: removed trailing space from some attributes (to avoid base64 encoding) enabled -LLL in defines.sh (should sed output to remove wrapping/comments/redundant separators) Misc: updated codes outputting LDIF to use new put interface TODO: handling of version attribute on input handling of URLs on input (ie: fetch URL)
1999-07-31 07:00:02 +08:00
usage( argv[0] );
Initial revision
1998-08-09 08:43:13 +08:00
}
Enhance LDIF handling ldapsearch: use draft guidelines for determining when to use -t only writes binary attributes to files -tt writes all attributes to files output now lists URL instead of path to such files -T dir can be used to specify directory to create temp files in -V urlprefix can be used to change the URL prefix LDIF is now commented (can be disabled using -LL) LDIF now contains version attribute (can be disabled with -LLL) LDIF: put interface changed to allow caller to specify how to encode put interface uses draft guidelines for determine when to base64 encode wrapping kludged to match old off by one bug Tests: removed trailing space from some attributes (to avoid base64 encoding) enabled -LLL in defines.sh (should sed output to remove wrapping/comments/redundant separators) Misc: updated codes outputting LDIF to use new put interface TODO: handling of version attribute on input handling of URLs on input (ie: fetch URL)
1999-07-31 07:00:02 +08:00
}
if ( argc - optind < 1 ) {
usage( argv[ 0 ] );
}
filtpattern = strdup( argv[ optind ] );
if ( argv[ optind + 1 ] == NULL ) {
attrs = NULL;
} else if ( sortattr == NULL || *sortattr == '\0' ) {
attrs = &argv[ optind + 1 ];
Initial revision
1998-08-09 08:43:13 +08:00
} else {
Enhance LDIF handling ldapsearch: use draft guidelines for determining when to use -t only writes binary attributes to files -tt writes all attributes to files output now lists URL instead of path to such files -T dir can be used to specify directory to create temp files in -V urlprefix can be used to change the URL prefix LDIF is now commented (can be disabled using -LL) LDIF now contains version attribute (can be disabled with -LLL) LDIF: put interface changed to allow caller to specify how to encode put interface uses draft guidelines for determine when to base64 encode wrapping kludged to match old off by one bug Tests: removed trailing space from some attributes (to avoid base64 encoding) enabled -LLL in defines.sh (should sed output to remove wrapping/comments/redundant separators) Misc: updated codes outputting LDIF to use new put interface TODO: handling of version attribute on input handling of URLs on input (ie: fetch URL)
1999-07-31 07:00:02 +08:00
for ( i = optind + 1; i < argc; i++ ) {
if ( strcasecmp( argv[ i ], sortattr ) == 0 ) {
break;
}
}
if ( i == argc ) {
skipsortattr = 1;
argv[ optind ] = sortattr;
} else {
optind++;
}
attrs = &argv[ optind ];
}
if ( infile != NULL ) {
if ( infile[0] == '-' && infile[1] == '\0' ) {
fp = stdin;
} else if (( fp = fopen( infile, "r" )) == NULL ) {
perror( infile );
return EXIT_FAILURE;
}
}
if( tmpdir == NULL
&& (tmpdir = getenv("TMPDIR")) == NULL
&& (tmpdir = getenv("TMP")) == NULL
&& (tmpdir = getenv("TEMP")) == NULL )
{
tmpdir = "/tmp";
Initial revision
1998-08-09 08:43:13 +08:00
}
Enhance LDIF handling ldapsearch: use draft guidelines for determining when to use -t only writes binary attributes to files -tt writes all attributes to files output now lists URL instead of path to such files -T dir can be used to specify directory to create temp files in -V urlprefix can be used to change the URL prefix LDIF is now commented (can be disabled using -LL) LDIF now contains version attribute (can be disabled with -LLL) LDIF: put interface changed to allow caller to specify how to encode put interface uses draft guidelines for determine when to base64 encode wrapping kludged to match old off by one bug Tests: removed trailing space from some attributes (to avoid base64 encoding) enabled -LLL in defines.sh (should sed output to remove wrapping/comments/redundant separators) Misc: updated codes outputting LDIF to use new put interface TODO: handling of version attribute on input handling of URLs on input (ie: fetch URL)
1999-07-31 07:00:02 +08:00
if( urlpre == NULL ) {
urlpre = malloc( sizeof("file:///") + strlen(tmpdir) );
if( urlpre == NULL ) {
perror( "malloc" );
return EXIT_FAILURE;
}
sprintf( urlpre, "file:///%s/",
tmpdir[0] == '/' ? &tmpdir[1] : tmpdir );
/* urlpre should be URLized.... */
Initial revision
1998-08-09 08:43:13 +08:00
}
Added lber_get/set_option. Removed lber_debug/ldap_debug. Updated other codes as needed.
1998-12-22 09:34:01 +08:00
if ( debug ) {
Check for not LDAP_OPT_SUCCESS instead of LDAP_OPT_ERROR.
1999-06-22 13:47:14 +08:00
if( ber_set_option( NULL, LBER_OPT_DEBUG_LEVEL, &debug ) != LBER_OPT_SUCCESS ) {
Add warnings if ldap_set_option() fails. Check for ldap_set_option() error using LDAP_OPT_ERROR, not -1. (probably should check != LDAP_OPT_SUCCESS instead). Added additional usage errors. Used return(EXIT_FAILURE) instead of exit(1). Used DIRSEP instead of '/' && '\\' Moved verbose output to stderr.
1999-05-30 02:53:40 +08:00
fprintf( stderr, "Could not set LBER_OPT_DEBUG_LEVEL %d\n", debug );
}
Check for not LDAP_OPT_SUCCESS instead of LDAP_OPT_ERROR.
1999-06-22 13:47:14 +08:00
if( ldap_set_option( NULL, LDAP_OPT_DEBUG_LEVEL, &debug ) != LDAP_OPT_SUCCESS ) {
Add warnings if ldap_set_option() fails. Check for ldap_set_option() error using LDAP_OPT_ERROR, not -1. (probably should check != LDAP_OPT_SUCCESS instead). Added additional usage errors. Used return(EXIT_FAILURE) instead of exit(1). Used DIRSEP instead of '/' && '\\' Moved verbose output to stderr.
1999-05-30 02:53:40 +08:00
fprintf( stderr, "Could not set LDAP_OPT_DEBUG_LEVEL %d\n", debug );
}
Added lber_get/set_option. Removed lber_debug/ldap_debug. Updated other codes as needed.
1998-12-22 09:34:01 +08:00
ldif_debug = debug;
}
ignore SIGPIPE
1999-01-21 06:01:14 +08:00
#ifdef SIGPIPE
(void) SIGNAL( SIGPIPE, SIG_IGN );
#endif
Enhance LDIF handling ldapsearch: use draft guidelines for determining when to use -t only writes binary attributes to files -tt writes all attributes to files output now lists URL instead of path to such files -T dir can be used to specify directory to create temp files in -V urlprefix can be used to change the URL prefix LDIF is now commented (can be disabled using -LL) LDIF now contains version attribute (can be disabled with -LLL) LDIF: put interface changed to allow caller to specify how to encode put interface uses draft guidelines for determine when to base64 encode wrapping kludged to match old off by one bug Tests: removed trailing space from some attributes (to avoid base64 encoding) enabled -LLL in defines.sh (should sed output to remove wrapping/comments/redundant separators) Misc: updated codes outputting LDIF to use new put interface TODO: handling of version attribute on input handling of URLs on input (ie: fetch URL)
1999-07-31 07:00:02 +08:00
if ( verbose ) {
Print "<DEFAULT>" instead of "0" when ldapport=0 in ldapsearch -v
1999-08-17 09:49:19 +08:00
fprintf( stderr,
(ldapport ? "ldap_init( %s, %d )\n" : "ldap_init( %s, <DEFAULT> )\n"),
Enhance LDIF handling ldapsearch: use draft guidelines for determining when to use -t only writes binary attributes to files -tt writes all attributes to files output now lists URL instead of path to such files -T dir can be used to specify directory to create temp files in -V urlprefix can be used to change the URL prefix LDIF is now commented (can be disabled using -LL) LDIF now contains version attribute (can be disabled with -LLL) LDIF: put interface changed to allow caller to specify how to encode put interface uses draft guidelines for determine when to base64 encode wrapping kludged to match old off by one bug Tests: removed trailing space from some attributes (to avoid base64 encoding) enabled -LLL in defines.sh (should sed output to remove wrapping/comments/redundant separators) Misc: updated codes outputting LDIF to use new put interface TODO: handling of version attribute on input handling of URLs on input (ie: fetch URL)
1999-07-31 07:00:02 +08:00
(ldaphost != NULL) ? ldaphost : "<DEFAULT>",
ldapport );
}
Fix ldap_send_initial_request() to open connection if not already openned (by ldap_open()). This allows ldap_init() to function properly!
1999-01-31 09:09:00 +08:00
Enhance LDIF handling ldapsearch: use draft guidelines for determining when to use -t only writes binary attributes to files -tt writes all attributes to files output now lists URL instead of path to such files -T dir can be used to specify directory to create temp files in -V urlprefix can be used to change the URL prefix LDIF is now commented (can be disabled using -LL) LDIF now contains version attribute (can be disabled with -LLL) LDIF: put interface changed to allow caller to specify how to encode put interface uses draft guidelines for determine when to base64 encode wrapping kludged to match old off by one bug Tests: removed trailing space from some attributes (to avoid base64 encoding) enabled -LLL in defines.sh (should sed output to remove wrapping/comments/redundant separators) Misc: updated codes outputting LDIF to use new put interface TODO: handling of version attribute on input handling of URLs on input (ie: fetch URL)
1999-07-31 07:00:02 +08:00
if (( ld = ldap_init( ldaphost, ldapport )) == NULL ) {
perror( "ldap_init" );
return( EXIT_FAILURE );
}
Updated Kerberos code, added password prompting. <dave@tamos.net>
1998-12-12 14:08:59 +08:00
Make ldap_set_option options optional.
1998-12-29 13:33:34 +08:00
if (deref != -1 &&
Check for not LDAP_OPT_SUCCESS instead of LDAP_OPT_ERROR.
1999-06-22 13:47:14 +08:00
ldap_set_option( ld, LDAP_OPT_DEREF, (void *) &deref ) != LDAP_OPT_SUCCESS )
Make ldap_set_option options optional.
1998-12-29 13:33:34 +08:00
{
Add warnings if ldap_set_option() fails. Check for ldap_set_option() error using LDAP_OPT_ERROR, not -1. (probably should check != LDAP_OPT_SUCCESS instead). Added additional usage errors. Used return(EXIT_FAILURE) instead of exit(1). Used DIRSEP instead of '/' && '\\' Moved verbose output to stderr.
1999-05-30 02:53:40 +08:00
fprintf( stderr, "Could not set LDAP_OPT_DEREF %d\n", deref );
Backout previous changes made by Dave as they excessive reformatting, reindentation, and use of spaces instead of tab. Diffs will be reviewed to identify and commit only functional changes as time permits. Note: this is more my fault than Dave's. I should have provided clearer guidance. Live and learn.
1998-12-14 18:10:41 +08:00
}
Make ldap_set_option options optional.
1998-12-29 13:33:34 +08:00
if (timelimit != -1 &&
Check for not LDAP_OPT_SUCCESS instead of LDAP_OPT_ERROR.
1999-06-22 13:47:14 +08:00
ldap_set_option( ld, LDAP_OPT_TIMELIMIT, (void *) &timelimit ) != LDAP_OPT_SUCCESS )
Make ldap_set_option options optional.
1998-12-29 13:33:34 +08:00
{
Add warnings if ldap_set_option() fails. Check for ldap_set_option() error using LDAP_OPT_ERROR, not -1. (probably should check != LDAP_OPT_SUCCESS instead). Added additional usage errors. Used return(EXIT_FAILURE) instead of exit(1). Used DIRSEP instead of '/' && '\\' Moved verbose output to stderr.
1999-05-30 02:53:40 +08:00
fprintf( stderr, "Could not set LDAP_OPT_TIMELIMIT %d\n", timelimit );
Backout previous changes made by Dave as they excessive reformatting, reindentation, and use of spaces instead of tab. Diffs will be reviewed to identify and commit only functional changes as time permits. Note: this is more my fault than Dave's. I should have provided clearer guidance. Live and learn.
1998-12-14 18:10:41 +08:00
}
Make ldap_set_option options optional.
1998-12-29 13:33:34 +08:00
if (sizelimit != -1 &&
Check for not LDAP_OPT_SUCCESS instead of LDAP_OPT_ERROR.
1999-06-22 13:47:14 +08:00
ldap_set_option( ld, LDAP_OPT_SIZELIMIT, (void *) &sizelimit ) != LDAP_OPT_SUCCESS )
Make ldap_set_option options optional.
1998-12-29 13:33:34 +08:00
{
Add warnings if ldap_set_option() fails. Check for ldap_set_option() error using LDAP_OPT_ERROR, not -1. (probably should check != LDAP_OPT_SUCCESS instead). Added additional usage errors. Used return(EXIT_FAILURE) instead of exit(1). Used DIRSEP instead of '/' && '\\' Moved verbose output to stderr.
1999-05-30 02:53:40 +08:00
fprintf( stderr, "Could not set LDAP_OPT_SIZELIMIT %d\n", sizelimit );
Backout previous changes made by Dave as they excessive reformatting, reindentation, and use of spaces instead of tab. Diffs will be reviewed to identify and commit only functional changes as time permits. Note: this is more my fault than Dave's. I should have provided clearer guidance. Live and learn.
1998-12-14 18:10:41 +08:00
}
Make ldap_set_option options optional.
1998-12-29 13:33:34 +08:00
if (referrals != -1 &&
Pass LDAP_OPT_<ON/OFF> instead of (void*)flag to ldap_set_option
1999-03-09 15:19:18 +08:00
ldap_set_option( ld, LDAP_OPT_REFERRALS,
Check for not LDAP_OPT_SUCCESS instead of LDAP_OPT_ERROR.
1999-06-22 13:47:14 +08:00
(referrals ? LDAP_OPT_ON : LDAP_OPT_OFF) ) != LDAP_OPT_SUCCESS )
Make ldap_set_option options optional.
1998-12-29 13:33:34 +08:00
{
Add warnings if ldap_set_option() fails. Check for ldap_set_option() error using LDAP_OPT_ERROR, not -1. (probably should check != LDAP_OPT_SUCCESS instead). Added additional usage errors. Used return(EXIT_FAILURE) instead of exit(1). Used DIRSEP instead of '/' && '\\' Moved verbose output to stderr.
1999-05-30 02:53:40 +08:00
fprintf( stderr, "Could not set LDAP_OPT_REFERRALS %s\n",
referrals ? "on" : "off" );
Backout previous changes made by Dave as they excessive reformatting, reindentation, and use of spaces instead of tab. Diffs will be reviewed to identify and commit only functional changes as time permits. Note: this is more my fault than Dave's. I should have provided clearer guidance. Live and learn.
1998-12-14 18:10:41 +08:00
}
Make ldap_set_option options optional.
1998-12-29 13:33:34 +08:00
if (version != -1 &&
Check for not LDAP_OPT_SUCCESS instead of LDAP_OPT_ERROR.
1999-06-22 13:47:14 +08:00
ldap_set_option( ld, LDAP_OPT_PROTOCOL_VERSION, &version ) != LDAP_OPT_SUCCESS )
Make ldap_set_option options optional.
1998-12-29 13:33:34 +08:00
{
Add warnings if ldap_set_option() fails. Check for ldap_set_option() error using LDAP_OPT_ERROR, not -1. (probably should check != LDAP_OPT_SUCCESS instead). Added additional usage errors. Used return(EXIT_FAILURE) instead of exit(1). Used DIRSEP instead of '/' && '\\' Moved verbose output to stderr.
1999-05-30 02:53:40 +08:00
fprintf( stderr, "Could not set LDAP_OPT_PROTOCOL_VERSION %d\n", version );
Add support for -P protocol_version.
1998-12-27 22:08:46 +08:00
}
Enhance LDIF handling ldapsearch: use draft guidelines for determining when to use -t only writes binary attributes to files -tt writes all attributes to files output now lists URL instead of path to such files -T dir can be used to specify directory to create temp files in -V urlprefix can be used to change the URL prefix LDIF is now commented (can be disabled using -LL) LDIF now contains version attribute (can be disabled with -LLL) LDIF: put interface changed to allow caller to specify how to encode put interface uses draft guidelines for determine when to base64 encode wrapping kludged to match old off by one bug Tests: removed trailing space from some attributes (to avoid base64 encoding) enabled -LLL in defines.sh (should sed output to remove wrapping/comments/redundant separators) Misc: updated codes outputting LDIF to use new put interface TODO: handling of version attribute on input handling of URLs on input (ie: fetch URL)
1999-07-31 07:00:02 +08:00
if (want_bindpw) {
Added support for password prompting. (-W switch)
1998-12-15 10:00:09 +08:00
passwd = getpass("Enter LDAP Password: ");
Enhance LDIF handling ldapsearch: use draft guidelines for determining when to use -t only writes binary attributes to files -tt writes all attributes to files output now lists URL instead of path to such files -T dir can be used to specify directory to create temp files in -V urlprefix can be used to change the URL prefix LDIF is now commented (can be disabled using -LL) LDIF now contains version attribute (can be disabled with -LLL) LDIF: put interface changed to allow caller to specify how to encode put interface uses draft guidelines for determine when to base64 encode wrapping kludged to match old off by one bug Tests: removed trailing space from some attributes (to avoid base64 encoding) enabled -LLL in defines.sh (should sed output to remove wrapping/comments/redundant separators) Misc: updated codes outputting LDIF to use new put interface TODO: handling of version attribute on input handling of URLs on input (ie: fetch URL)
1999-07-31 07:00:02 +08:00
}
Added support for password prompting. (-W switch)
1998-12-15 10:00:09 +08:00
Enhance LDIF handling ldapsearch: use draft guidelines for determining when to use -t only writes binary attributes to files -tt writes all attributes to files output now lists URL instead of path to such files -T dir can be used to specify directory to create temp files in -V urlprefix can be used to change the URL prefix LDIF is now commented (can be disabled using -LL) LDIF now contains version attribute (can be disabled with -LLL) LDIF: put interface changed to allow caller to specify how to encode put interface uses draft guidelines for determine when to base64 encode wrapping kludged to match old off by one bug Tests: removed trailing space from some attributes (to avoid base64 encoding) enabled -LLL in defines.sh (should sed output to remove wrapping/comments/redundant separators) Misc: updated codes outputting LDIF to use new put interface TODO: handling of version attribute on input handling of URLs on input (ie: fetch URL)
1999-07-31 07:00:02 +08:00
if ( ldap_bind_s( ld, binddn, passwd, authmethod ) != LDAP_SUCCESS ) {
ldap_perror( ld, "ldap_bind" );
return( EXIT_FAILURE );
Initial revision
1998-08-09 08:43:13 +08:00
}
Import experimental referral implementation from OPENLDAP_DEVEL_REFERRALS. Includes support for update referral for each replicated backend. Reworked replication test to use update referral. Includes major rewrite of response encoding codes (result.c). Includes reworked alias support and eliminates old suffix alias codes (can be emulated using named alias). Includes (untested) support for the Manage DSA IT control. Works in LDAPv2 world. Still testing in LDAPv3 world. Added default referral (test009) test.
1999-07-16 10:45:46 +08:00
if ( manageDSAit ) {
int err;
LDAPControl c;
LDAPControl *ctrls[2];
ctrls[0] = &c;
ctrls[1] = NULL;
c.ldctl_oid = LDAP_CONTROL_MANAGEDSAIT;
c.ldctl_value.bv_val = NULL;
c.ldctl_value.bv_len = 0;
c.ldctl_iscritical = manageDSAit > 1;
err = ldap_set_option( ld, LDAP_OPT_SERVER_CONTROLS, &ctrls );
if( err != LDAP_OPT_SUCCESS ) {
fprintf( stderr, "Could not set Manage DSA IT Control\n" );
if( c.ldctl_iscritical ) {
exit( EXIT_FAILURE );
}
}
}
Enhance LDIF handling ldapsearch: use draft guidelines for determining when to use -t only writes binary attributes to files -tt writes all attributes to files output now lists URL instead of path to such files -T dir can be used to specify directory to create temp files in -V urlprefix can be used to change the URL prefix LDIF is now commented (can be disabled using -LL) LDIF now contains version attribute (can be disabled with -LLL) LDIF: put interface changed to allow caller to specify how to encode put interface uses draft guidelines for determine when to base64 encode wrapping kludged to match old off by one bug Tests: removed trailing space from some attributes (to avoid base64 encoding) enabled -LLL in defines.sh (should sed output to remove wrapping/comments/redundant separators) Misc: updated codes outputting LDIF to use new put interface TODO: handling of version attribute on input handling of URLs on input (ie: fetch URL)
1999-07-31 07:00:02 +08:00
if ( verbose ) {
fprintf( stderr, "filter%s: %s\nreturning: ",
infile != NULL ? " pattern" : "",
filtpattern );
if ( attrs == NULL ) {
printf "ALL" to stderr.
1999-08-17 03:09:40 +08:00
fprintf( stderr, "ALL" );
Enhance LDIF handling ldapsearch: use draft guidelines for determining when to use -t only writes binary attributes to files -tt writes all attributes to files output now lists URL instead of path to such files -T dir can be used to specify directory to create temp files in -V urlprefix can be used to change the URL prefix LDIF is now commented (can be disabled using -LL) LDIF now contains version attribute (can be disabled with -LLL) LDIF: put interface changed to allow caller to specify how to encode put interface uses draft guidelines for determine when to base64 encode wrapping kludged to match old off by one bug Tests: removed trailing space from some attributes (to avoid base64 encoding) enabled -LLL in defines.sh (should sed output to remove wrapping/comments/redundant separators) Misc: updated codes outputting LDIF to use new put interface TODO: handling of version attribute on input handling of URLs on input (ie: fetch URL)
1999-07-31 07:00:02 +08:00
} else {
for ( i = 0; attrs[ i ] != NULL; ++i ) {
fprintf( stderr, "%s ", attrs[ i ] );
}
}
fprintf( stderr, "\n" );
Initial revision
1998-08-09 08:43:13 +08:00
}
Enhance LDIF handling ldapsearch: use draft guidelines for determining when to use -t only writes binary attributes to files -tt writes all attributes to files output now lists URL instead of path to such files -T dir can be used to specify directory to create temp files in -V urlprefix can be used to change the URL prefix LDIF is now commented (can be disabled using -LL) LDIF now contains version attribute (can be disabled with -LLL) LDIF: put interface changed to allow caller to specify how to encode put interface uses draft guidelines for determine when to base64 encode wrapping kludged to match old off by one bug Tests: removed trailing space from some attributes (to avoid base64 encoding) enabled -LLL in defines.sh (should sed output to remove wrapping/comments/redundant separators) Misc: updated codes outputting LDIF to use new put interface TODO: handling of version attribute on input handling of URLs on input (ie: fetch URL)
1999-07-31 07:00:02 +08:00
if ( ldif ) {
if (ldif < 3 ) {
Kludge ldapmodify to accept "version: 1" in LDIF input.
1999-07-31 08:35:30 +08:00
printf( "version: 1\n\n");
Enhance LDIF handling ldapsearch: use draft guidelines for determining when to use -t only writes binary attributes to files -tt writes all attributes to files output now lists URL instead of path to such files -T dir can be used to specify directory to create temp files in -V urlprefix can be used to change the URL prefix LDIF is now commented (can be disabled using -LL) LDIF now contains version attribute (can be disabled with -LLL) LDIF: put interface changed to allow caller to specify how to encode put interface uses draft guidelines for determine when to base64 encode wrapping kludged to match old off by one bug Tests: removed trailing space from some attributes (to avoid base64 encoding) enabled -LLL in defines.sh (should sed output to remove wrapping/comments/redundant separators) Misc: updated codes outputting LDIF to use new put interface TODO: handling of version attribute on input handling of URLs on input (ie: fetch URL)
1999-07-31 07:00:02 +08:00
}
if (ldif < 2 ) {
printf( "#\n# filter%s: %s\n# returning: ",
infile != NULL ? " pattern" : "",
filtpattern );
if ( attrs == NULL ) {
printf( "ALL" );
} else {
for ( i = 0; attrs[ i ] != NULL; ++i ) {
printf( "%s ", attrs[ i ] );
}
}
printf( "\n#\n\n" );
}
Initial revision
1998-08-09 08:43:13 +08:00
}
Enhance LDIF handling ldapsearch: use draft guidelines for determining when to use -t only writes binary attributes to files -tt writes all attributes to files output now lists URL instead of path to such files -T dir can be used to specify directory to create temp files in -V urlprefix can be used to change the URL prefix LDIF is now commented (can be disabled using -LL) LDIF now contains version attribute (can be disabled with -LLL) LDIF: put interface changed to allow caller to specify how to encode put interface uses draft guidelines for determine when to base64 encode wrapping kludged to match old off by one bug Tests: removed trailing space from some attributes (to avoid base64 encoding) enabled -LLL in defines.sh (should sed output to remove wrapping/comments/redundant separators) Misc: updated codes outputting LDIF to use new put interface TODO: handling of version attribute on input handling of URLs on input (ie: fetch URL)
1999-07-31 07:00:02 +08:00
if ( infile == NULL ) {
rc = dosearch( ld, base, scope, attrs, attrsonly, NULL, filtpattern );
Updated MSVC5 workspaces and projects. Added ac/stdarg.h and updated liblber encode/decode to use it.
1998-11-06 09:18:49 +08:00
Enhance LDIF handling ldapsearch: use draft guidelines for determining when to use -t only writes binary attributes to files -tt writes all attributes to files output now lists URL instead of path to such files -T dir can be used to specify directory to create temp files in -V urlprefix can be used to change the URL prefix LDIF is now commented (can be disabled using -LL) LDIF now contains version attribute (can be disabled with -LLL) LDIF: put interface changed to allow caller to specify how to encode put interface uses draft guidelines for determine when to base64 encode wrapping kludged to match old off by one bug Tests: removed trailing space from some attributes (to avoid base64 encoding) enabled -LLL in defines.sh (should sed output to remove wrapping/comments/redundant separators) Misc: updated codes outputting LDIF to use new put interface TODO: handling of version attribute on input handling of URLs on input (ie: fetch URL)
1999-07-31 07:00:02 +08:00
} else {
rc = 0;
first = 1;
while ( rc == 0 && fgets( line, sizeof( line ), fp ) != NULL ) {
line[ strlen( line ) - 1 ] = '\0';
if ( !first ) {
putchar( '\n' );
} else {
first = 0;
}
rc = dosearch( ld, base, scope, attrs, attrsonly,
filtpattern, line );
}
if ( fp != stdin ) {
fclose( fp );
}
}
Add warnings if ldap_set_option() fails. Check for ldap_set_option() error using LDAP_OPT_ERROR, not -1. (probably should check != LDAP_OPT_SUCCESS instead). Added additional usage errors. Used return(EXIT_FAILURE) instead of exit(1). Used DIRSEP instead of '/' && '\\' Moved verbose output to stderr.
1999-05-30 02:53:40 +08:00
Enhance LDIF handling ldapsearch: use draft guidelines for determining when to use -t only writes binary attributes to files -tt writes all attributes to files output now lists URL instead of path to such files -T dir can be used to specify directory to create temp files in -V urlprefix can be used to change the URL prefix LDIF is now commented (can be disabled using -LL) LDIF now contains version attribute (can be disabled with -LLL) LDIF: put interface changed to allow caller to specify how to encode put interface uses draft guidelines for determine when to base64 encode wrapping kludged to match old off by one bug Tests: removed trailing space from some attributes (to avoid base64 encoding) enabled -LLL in defines.sh (should sed output to remove wrapping/comments/redundant separators) Misc: updated codes outputting LDIF to use new put interface TODO: handling of version attribute on input handling of URLs on input (ie: fetch URL)
1999-07-31 07:00:02 +08:00
ldap_unbind( ld );
Add warnings if ldap_set_option() fails. Check for ldap_set_option() error using LDAP_OPT_ERROR, not -1. (probably should check != LDAP_OPT_SUCCESS instead). Added additional usage errors. Used return(EXIT_FAILURE) instead of exit(1). Used DIRSEP instead of '/' && '\\' Moved verbose output to stderr.
1999-05-30 02:53:40 +08:00
return( rc );
Initial revision
1998-08-09 08:43:13 +08:00
}
merged with autoconf branch
1998-10-25 09:41:42 +08:00
static int dosearch(
LDAP *ld,
Enhance LDIF handling ldapsearch: use draft guidelines for determining when to use -t only writes binary attributes to files -tt writes all attributes to files output now lists URL instead of path to such files -T dir can be used to specify directory to create temp files in -V urlprefix can be used to change the URL prefix LDIF is now commented (can be disabled using -LL) LDIF now contains version attribute (can be disabled with -LLL) LDIF: put interface changed to allow caller to specify how to encode put interface uses draft guidelines for determine when to base64 encode wrapping kludged to match old off by one bug Tests: removed trailing space from some attributes (to avoid base64 encoding) enabled -LLL in defines.sh (should sed output to remove wrapping/comments/redundant separators) Misc: updated codes outputting LDIF to use new put interface TODO: handling of version attribute on input handling of URLs on input (ie: fetch URL)
1999-07-31 07:00:02 +08:00
char *base,
int scope,
char **attrs,
int attrsonly,
char *filtpatt,
char *value)
Initial revision
1998-08-09 08:43:13 +08:00
{
Enhance LDIF handling ldapsearch: use draft guidelines for determining when to use -t only writes binary attributes to files -tt writes all attributes to files output now lists URL instead of path to such files -T dir can be used to specify directory to create temp files in -V urlprefix can be used to change the URL prefix LDIF is now commented (can be disabled using -LL) LDIF now contains version attribute (can be disabled with -LLL) LDIF: put interface changed to allow caller to specify how to encode put interface uses draft guidelines for determine when to base64 encode wrapping kludged to match old off by one bug Tests: removed trailing space from some attributes (to avoid base64 encoding) enabled -LLL in defines.sh (should sed output to remove wrapping/comments/redundant separators) Misc: updated codes outputting LDIF to use new put interface TODO: handling of version attribute on input handling of URLs on input (ie: fetch URL)
1999-07-31 07:00:02 +08:00
char filter[ BUFSIZ ];
int rc, first, matches;
LDAPMessage *res, *e;
if( filtpatt != NULL ) {
sprintf( filter, filtpatt, value );
Initial revision
1998-08-09 08:43:13 +08:00
Enhance LDIF handling ldapsearch: use draft guidelines for determining when to use -t only writes binary attributes to files -tt writes all attributes to files output now lists URL instead of path to such files -T dir can be used to specify directory to create temp files in -V urlprefix can be used to change the URL prefix LDIF is now commented (can be disabled using -LL) LDIF now contains version attribute (can be disabled with -LLL) LDIF: put interface changed to allow caller to specify how to encode put interface uses draft guidelines for determine when to base64 encode wrapping kludged to match old off by one bug Tests: removed trailing space from some attributes (to avoid base64 encoding) enabled -LLL in defines.sh (should sed output to remove wrapping/comments/redundant separators) Misc: updated codes outputting LDIF to use new put interface TODO: handling of version attribute on input handling of URLs on input (ie: fetch URL)
1999-07-31 07:00:02 +08:00
if ( verbose ) {
fprintf( stderr, "filter is: (%s)\n", filter );
}
Initial revision
1998-08-09 08:43:13 +08:00
Enhance LDIF handling ldapsearch: use draft guidelines for determining when to use -t only writes binary attributes to files -tt writes all attributes to files output now lists URL instead of path to such files -T dir can be used to specify directory to create temp files in -V urlprefix can be used to change the URL prefix LDIF is now commented (can be disabled using -LL) LDIF now contains version attribute (can be disabled with -LLL) LDIF: put interface changed to allow caller to specify how to encode put interface uses draft guidelines for determine when to base64 encode wrapping kludged to match old off by one bug Tests: removed trailing space from some attributes (to avoid base64 encoding) enabled -LLL in defines.sh (should sed output to remove wrapping/comments/redundant separators) Misc: updated codes outputting LDIF to use new put interface TODO: handling of version attribute on input handling of URLs on input (ie: fetch URL)
1999-07-31 07:00:02 +08:00
if( ldif == 1 ) {
printf( "#\n# filter: %s\n#\n", filter );
}
Initial revision
1998-08-09 08:43:13 +08:00
Enhance LDIF handling ldapsearch: use draft guidelines for determining when to use -t only writes binary attributes to files -tt writes all attributes to files output now lists URL instead of path to such files -T dir can be used to specify directory to create temp files in -V urlprefix can be used to change the URL prefix LDIF is now commented (can be disabled using -LL) LDIF now contains version attribute (can be disabled with -LLL) LDIF: put interface changed to allow caller to specify how to encode put interface uses draft guidelines for determine when to base64 encode wrapping kludged to match old off by one bug Tests: removed trailing space from some attributes (to avoid base64 encoding) enabled -LLL in defines.sh (should sed output to remove wrapping/comments/redundant separators) Misc: updated codes outputting LDIF to use new put interface TODO: handling of version attribute on input handling of URLs on input (ie: fetch URL)
1999-07-31 07:00:02 +08:00
} else {
sprintf( filter, "%s", value );
}
Initial revision
1998-08-09 08:43:13 +08:00
Enhance LDIF handling ldapsearch: use draft guidelines for determining when to use -t only writes binary attributes to files -tt writes all attributes to files output now lists URL instead of path to such files -T dir can be used to specify directory to create temp files in -V urlprefix can be used to change the URL prefix LDIF is now commented (can be disabled using -LL) LDIF now contains version attribute (can be disabled with -LLL) LDIF: put interface changed to allow caller to specify how to encode put interface uses draft guidelines for determine when to base64 encode wrapping kludged to match old off by one bug Tests: removed trailing space from some attributes (to avoid base64 encoding) enabled -LLL in defines.sh (should sed output to remove wrapping/comments/redundant separators) Misc: updated codes outputting LDIF to use new put interface TODO: handling of version attribute on input handling of URLs on input (ie: fetch URL)
1999-07-31 07:00:02 +08:00
if ( not ) {
return( LDAP_SUCCESS );
}
if ( ldap_search( ld, base, scope, filter, attrs, attrsonly ) == -1 ) {
Replaced #ifdef'ed ldap_lderrno() call with ldap_get_option() call.
1998-11-04 09:44:41 +08:00
int ld_errno;
ldap_perror( ld, "ldap_search" );
ldap_get_option(ld, LDAP_OPT_ERROR_NUMBER, &ld_errno);
return( ld_errno );
Enhance LDIF handling ldapsearch: use draft guidelines for determining when to use -t only writes binary attributes to files -tt writes all attributes to files output now lists URL instead of path to such files -T dir can be used to specify directory to create temp files in -V urlprefix can be used to change the URL prefix LDIF is now commented (can be disabled using -LL) LDIF now contains version attribute (can be disabled with -LLL) LDIF: put interface changed to allow caller to specify how to encode put interface uses draft guidelines for determine when to base64 encode wrapping kludged to match old off by one bug Tests: removed trailing space from some attributes (to avoid base64 encoding) enabled -LLL in defines.sh (should sed output to remove wrapping/comments/redundant separators) Misc: updated codes outputting LDIF to use new put interface TODO: handling of version attribute on input handling of URLs on input (ie: fetch URL)
1999-07-31 07:00:02 +08:00
}
Initial revision
1998-08-09 08:43:13 +08:00
Enhance LDIF handling ldapsearch: use draft guidelines for determining when to use -t only writes binary attributes to files -tt writes all attributes to files output now lists URL instead of path to such files -T dir can be used to specify directory to create temp files in -V urlprefix can be used to change the URL prefix LDIF is now commented (can be disabled using -LL) LDIF now contains version attribute (can be disabled with -LLL) LDIF: put interface changed to allow caller to specify how to encode put interface uses draft guidelines for determine when to base64 encode wrapping kludged to match old off by one bug Tests: removed trailing space from some attributes (to avoid base64 encoding) enabled -LLL in defines.sh (should sed output to remove wrapping/comments/redundant separators) Misc: updated codes outputting LDIF to use new put interface TODO: handling of version attribute on input handling of URLs on input (ie: fetch URL)
1999-07-31 07:00:02 +08:00
matches = 0;
first = 1;
res = NULL;
while ( (rc = ldap_result( ld, LDAP_RES_ANY, sortattr ? 1 : 0, NULL, &res ))
== LDAP_RES_SEARCH_ENTRY ) {
Initial revision
1998-08-09 08:43:13 +08:00
matches++;
e = ldap_first_entry( ld, res );
if ( !first ) {
Enhance LDIF handling ldapsearch: use draft guidelines for determining when to use -t only writes binary attributes to files -tt writes all attributes to files output now lists URL instead of path to such files -T dir can be used to specify directory to create temp files in -V urlprefix can be used to change the URL prefix LDIF is now commented (can be disabled using -LL) LDIF now contains version attribute (can be disabled with -LLL) LDIF: put interface changed to allow caller to specify how to encode put interface uses draft guidelines for determine when to base64 encode wrapping kludged to match old off by one bug Tests: removed trailing space from some attributes (to avoid base64 encoding) enabled -LLL in defines.sh (should sed output to remove wrapping/comments/redundant separators) Misc: updated codes outputting LDIF to use new put interface TODO: handling of version attribute on input handling of URLs on input (ie: fetch URL)
1999-07-31 07:00:02 +08:00
putchar( '\n' );
Initial revision
1998-08-09 08:43:13 +08:00
} else {
Enhance LDIF handling ldapsearch: use draft guidelines for determining when to use -t only writes binary attributes to files -tt writes all attributes to files output now lists URL instead of path to such files -T dir can be used to specify directory to create temp files in -V urlprefix can be used to change the URL prefix LDIF is now commented (can be disabled using -LL) LDIF now contains version attribute (can be disabled with -LLL) LDIF: put interface changed to allow caller to specify how to encode put interface uses draft guidelines for determine when to base64 encode wrapping kludged to match old off by one bug Tests: removed trailing space from some attributes (to avoid base64 encoding) enabled -LLL in defines.sh (should sed output to remove wrapping/comments/redundant separators) Misc: updated codes outputting LDIF to use new put interface TODO: handling of version attribute on input handling of URLs on input (ie: fetch URL)
1999-07-31 07:00:02 +08:00
first = 0;
Initial revision
1998-08-09 08:43:13 +08:00
}
print_entry( ld, e, attrsonly );
ldap_msgfree( res );
found my lber bug... ber_buf should have been freed in ber_peek_tag. Ugh!
1999-05-21 05:53:56 +08:00
res = NULL;
Enhance LDIF handling ldapsearch: use draft guidelines for determining when to use -t only writes binary attributes to files -tt writes all attributes to files output now lists URL instead of path to such files -T dir can be used to specify directory to create temp files in -V urlprefix can be used to change the URL prefix LDIF is now commented (can be disabled using -LL) LDIF now contains version attribute (can be disabled with -LLL) LDIF: put interface changed to allow caller to specify how to encode put interface uses draft guidelines for determine when to base64 encode wrapping kludged to match old off by one bug Tests: removed trailing space from some attributes (to avoid base64 encoding) enabled -LLL in defines.sh (should sed output to remove wrapping/comments/redundant separators) Misc: updated codes outputting LDIF to use new put interface TODO: handling of version attribute on input handling of URLs on input (ie: fetch URL)
1999-07-31 07:00:02 +08:00
}
if ( rc == -1 ) {
Initial revision
1998-08-09 08:43:13 +08:00
ldap_perror( ld, "ldap_result" );
return( rc );
Enhance LDIF handling ldapsearch: use draft guidelines for determining when to use -t only writes binary attributes to files -tt writes all attributes to files output now lists URL instead of path to such files -T dir can be used to specify directory to create temp files in -V urlprefix can be used to change the URL prefix LDIF is now commented (can be disabled using -LL) LDIF now contains version attribute (can be disabled with -LLL) LDIF: put interface changed to allow caller to specify how to encode put interface uses draft guidelines for determine when to base64 encode wrapping kludged to match old off by one bug Tests: removed trailing space from some attributes (to avoid base64 encoding) enabled -LLL in defines.sh (should sed output to remove wrapping/comments/redundant separators) Misc: updated codes outputting LDIF to use new put interface TODO: handling of version attribute on input handling of URLs on input (ie: fetch URL)
1999-07-31 07:00:02 +08:00
}
if (( rc = ldap_result2error( ld, res, 0 )) != LDAP_SUCCESS ) {
ldap_perror( ld, "ldap_search" );
}
if ( sortattr != NULL ) {
(void) ldap_sort_entries( ld, &res,
( *sortattr == '\0' ) ? NULL : sortattr, strcasecmp );
matches = 0;
first = 1;
for ( e = ldap_first_entry( ld, res ); e != NULL;
e = ldap_next_entry( ld, e ) ) {
Initial revision
1998-08-09 08:43:13 +08:00
matches++;
if ( !first ) {
Enhance LDIF handling ldapsearch: use draft guidelines for determining when to use -t only writes binary attributes to files -tt writes all attributes to files output now lists URL instead of path to such files -T dir can be used to specify directory to create temp files in -V urlprefix can be used to change the URL prefix LDIF is now commented (can be disabled using -LL) LDIF now contains version attribute (can be disabled with -LLL) LDIF: put interface changed to allow caller to specify how to encode put interface uses draft guidelines for determine when to base64 encode wrapping kludged to match old off by one bug Tests: removed trailing space from some attributes (to avoid base64 encoding) enabled -LLL in defines.sh (should sed output to remove wrapping/comments/redundant separators) Misc: updated codes outputting LDIF to use new put interface TODO: handling of version attribute on input handling of URLs on input (ie: fetch URL)
1999-07-31 07:00:02 +08:00
putchar( '\n' );
Initial revision
1998-08-09 08:43:13 +08:00
} else {
Enhance LDIF handling ldapsearch: use draft guidelines for determining when to use -t only writes binary attributes to files -tt writes all attributes to files output now lists URL instead of path to such files -T dir can be used to specify directory to create temp files in -V urlprefix can be used to change the URL prefix LDIF is now commented (can be disabled using -LL) LDIF now contains version attribute (can be disabled with -LLL) LDIF: put interface changed to allow caller to specify how to encode put interface uses draft guidelines for determine when to base64 encode wrapping kludged to match old off by one bug Tests: removed trailing space from some attributes (to avoid base64 encoding) enabled -LLL in defines.sh (should sed output to remove wrapping/comments/redundant separators) Misc: updated codes outputting LDIF to use new put interface TODO: handling of version attribute on input handling of URLs on input (ie: fetch URL)
1999-07-31 07:00:02 +08:00
first = 0;
Initial revision
1998-08-09 08:43:13 +08:00
}
print_entry( ld, e, attrsonly );
Enhance LDIF handling ldapsearch: use draft guidelines for determining when to use -t only writes binary attributes to files -tt writes all attributes to files output now lists URL instead of path to such files -T dir can be used to specify directory to create temp files in -V urlprefix can be used to change the URL prefix LDIF is now commented (can be disabled using -LL) LDIF now contains version attribute (can be disabled with -LLL) LDIF: put interface changed to allow caller to specify how to encode put interface uses draft guidelines for determine when to base64 encode wrapping kludged to match old off by one bug Tests: removed trailing space from some attributes (to avoid base64 encoding) enabled -LLL in defines.sh (should sed output to remove wrapping/comments/redundant separators) Misc: updated codes outputting LDIF to use new put interface TODO: handling of version attribute on input handling of URLs on input (ie: fetch URL)
1999-07-31 07:00:02 +08:00
}
}
Initial revision
1998-08-09 08:43:13 +08:00
Enhance LDIF handling ldapsearch: use draft guidelines for determining when to use -t only writes binary attributes to files -tt writes all attributes to files output now lists URL instead of path to such files -T dir can be used to specify directory to create temp files in -V urlprefix can be used to change the URL prefix LDIF is now commented (can be disabled using -LL) LDIF now contains version attribute (can be disabled with -LLL) LDIF: put interface changed to allow caller to specify how to encode put interface uses draft guidelines for determine when to base64 encode wrapping kludged to match old off by one bug Tests: removed trailing space from some attributes (to avoid base64 encoding) enabled -LLL in defines.sh (should sed output to remove wrapping/comments/redundant separators) Misc: updated codes outputting LDIF to use new put interface TODO: handling of version attribute on input handling of URLs on input (ie: fetch URL)
1999-07-31 07:00:02 +08:00
if ( verbose ) {
printf( "%d matches\n", matches );
}
Initial revision
1998-08-09 08:43:13 +08:00
Enhance LDIF handling ldapsearch: use draft guidelines for determining when to use -t only writes binary attributes to files -tt writes all attributes to files output now lists URL instead of path to such files -T dir can be used to specify directory to create temp files in -V urlprefix can be used to change the URL prefix LDIF is now commented (can be disabled using -LL) LDIF now contains version attribute (can be disabled with -LLL) LDIF: put interface changed to allow caller to specify how to encode put interface uses draft guidelines for determine when to base64 encode wrapping kludged to match old off by one bug Tests: removed trailing space from some attributes (to avoid base64 encoding) enabled -LLL in defines.sh (should sed output to remove wrapping/comments/redundant separators) Misc: updated codes outputting LDIF to use new put interface TODO: handling of version attribute on input handling of URLs on input (ie: fetch URL)
1999-07-31 07:00:02 +08:00
ldap_msgfree( res );
return( rc );
Initial revision
1998-08-09 08:43:13 +08:00
}
Cleanup: Fix printf formats, remove unused variables, add missing prototypes in slapd, add static/const, add some return types or change to void return type.
1999-09-02 16:05:17 +08:00
static void
print_entry(
Enhance LDIF handling ldapsearch: use draft guidelines for determining when to use -t only writes binary attributes to files -tt writes all attributes to files output now lists URL instead of path to such files -T dir can be used to specify directory to create temp files in -V urlprefix can be used to change the URL prefix LDIF is now commented (can be disabled using -LL) LDIF now contains version attribute (can be disabled with -LLL) LDIF: put interface changed to allow caller to specify how to encode put interface uses draft guidelines for determine when to base64 encode wrapping kludged to match old off by one bug Tests: removed trailing space from some attributes (to avoid base64 encoding) enabled -LLL in defines.sh (should sed output to remove wrapping/comments/redundant separators) Misc: updated codes outputting LDIF to use new put interface TODO: handling of version attribute on input handling of URLs on input (ie: fetch URL)
1999-07-31 07:00:02 +08:00
LDAP *ld,
LDAPMessage *entry,
int attrsonly)
Initial revision
1998-08-09 08:43:13 +08:00
{
Enhance LDIF handling ldapsearch: use draft guidelines for determining when to use -t only writes binary attributes to files -tt writes all attributes to files output now lists URL instead of path to such files -T dir can be used to specify directory to create temp files in -V urlprefix can be used to change the URL prefix LDIF is now commented (can be disabled using -LL) LDIF now contains version attribute (can be disabled with -LLL) LDIF: put interface changed to allow caller to specify how to encode put interface uses draft guidelines for determine when to base64 encode wrapping kludged to match old off by one bug Tests: removed trailing space from some attributes (to avoid base64 encoding) enabled -LLL in defines.sh (should sed output to remove wrapping/comments/redundant separators) Misc: updated codes outputting LDIF to use new put interface TODO: handling of version attribute on input handling of URLs on input (ie: fetch URL)
1999-07-31 07:00:02 +08:00
char *a, *dn, *ufn;
char tmpfname[ 256 ];
char url[ 256 ];
int i;
BerElement *ber = NULL;
struct berval **bvals;
FILE *tmpfp;
dn = ldap_get_dn( ld, entry );
ufn = NULL;
if ( ldif == 1 ) {
ufn = ldap_dn2ufn( dn );
write_ldif( LDIF_PUT_COMMENT, NULL, ufn, strlen( ufn ));
}
Initial revision
1998-08-09 08:43:13 +08:00
if ( ldif ) {
Enhance LDIF handling ldapsearch: use draft guidelines for determining when to use -t only writes binary attributes to files -tt writes all attributes to files output now lists URL instead of path to such files -T dir can be used to specify directory to create temp files in -V urlprefix can be used to change the URL prefix LDIF is now commented (can be disabled using -LL) LDIF now contains version attribute (can be disabled with -LLL) LDIF: put interface changed to allow caller to specify how to encode put interface uses draft guidelines for determine when to base64 encode wrapping kludged to match old off by one bug Tests: removed trailing space from some attributes (to avoid base64 encoding) enabled -LLL in defines.sh (should sed output to remove wrapping/comments/redundant separators) Misc: updated codes outputting LDIF to use new put interface TODO: handling of version attribute on input handling of URLs on input (ie: fetch URL)
1999-07-31 07:00:02 +08:00
write_ldif( LDIF_PUT_VALUE, "dn", dn, strlen( dn ));
Initial revision
1998-08-09 08:43:13 +08:00
} else {
Enhance LDIF handling ldapsearch: use draft guidelines for determining when to use -t only writes binary attributes to files -tt writes all attributes to files output now lists URL instead of path to such files -T dir can be used to specify directory to create temp files in -V urlprefix can be used to change the URL prefix LDIF is now commented (can be disabled using -LL) LDIF now contains version attribute (can be disabled with -LLL) LDIF: put interface changed to allow caller to specify how to encode put interface uses draft guidelines for determine when to base64 encode wrapping kludged to match old off by one bug Tests: removed trailing space from some attributes (to avoid base64 encoding) enabled -LLL in defines.sh (should sed output to remove wrapping/comments/redundant separators) Misc: updated codes outputting LDIF to use new put interface TODO: handling of version attribute on input handling of URLs on input (ie: fetch URL)
1999-07-31 07:00:02 +08:00
printf( "%s\n", dn );
}
if ( includeufn ) {
if( ufn == NULL ) {
ufn = ldap_dn2ufn( dn );
}
if ( ldif ) {
write_ldif( LDIF_PUT_VALUE, "ufn", ufn, strlen( ufn ));
Initial revision
1998-08-09 08:43:13 +08:00
} else {
Enhance LDIF handling ldapsearch: use draft guidelines for determining when to use -t only writes binary attributes to files -tt writes all attributes to files output now lists URL instead of path to such files -T dir can be used to specify directory to create temp files in -V urlprefix can be used to change the URL prefix LDIF is now commented (can be disabled using -LL) LDIF now contains version attribute (can be disabled with -LLL) LDIF: put interface changed to allow caller to specify how to encode put interface uses draft guidelines for determine when to base64 encode wrapping kludged to match old off by one bug Tests: removed trailing space from some attributes (to avoid base64 encoding) enabled -LLL in defines.sh (should sed output to remove wrapping/comments/redundant separators) Misc: updated codes outputting LDIF to use new put interface TODO: handling of version attribute on input handling of URLs on input (ie: fetch URL)
1999-07-31 07:00:02 +08:00
printf( "%s\n", ufn );
}
}
if( ufn != NULL ) ldap_memfree( ufn );
ldap_memfree( dn );
for ( a = ldap_first_attribute( ld, entry, &ber ); a != NULL;
a = ldap_next_attribute( ld, entry, ber ) )
{
if ( skipsortattr && strcasecmp( a, sortattr ) == 0 ) {
continue;
}
if ( attrsonly ) {
if ( ldif ) {
write_ldif( LDIF_PUT_NOVALUE, a, NULL, 0 );
} else {
printf( "%s\n", a );
Initial revision
1998-08-09 08:43:13 +08:00
}
Enhance LDIF handling ldapsearch: use draft guidelines for determining when to use -t only writes binary attributes to files -tt writes all attributes to files output now lists URL instead of path to such files -T dir can be used to specify directory to create temp files in -V urlprefix can be used to change the URL prefix LDIF is now commented (can be disabled using -LL) LDIF now contains version attribute (can be disabled with -LLL) LDIF: put interface changed to allow caller to specify how to encode put interface uses draft guidelines for determine when to base64 encode wrapping kludged to match old off by one bug Tests: removed trailing space from some attributes (to avoid base64 encoding) enabled -LLL in defines.sh (should sed output to remove wrapping/comments/redundant separators) Misc: updated codes outputting LDIF to use new put interface TODO: handling of version attribute on input handling of URLs on input (ie: fetch URL)
1999-07-31 07:00:02 +08:00
} else if (( bvals = ldap_get_values_len( ld, entry, a )) != NULL ) {
for ( i = 0; bvals[i] != NULL; i++ ) {
if ( vals2tmp > 1 || ( vals2tmp
&& ldif_is_not_printable( bvals[i]->bv_val, bvals[i]->bv_len ) ))
{
/* write value to file */
sprintf( tmpfname, "%s" LDAP_DIRSEP "ldapsearch-%s-XXXXXX",
tmpdir, a );
tmpfp = NULL;
if ( mktemp( tmpfname ) == NULL ) {
perror( tmpfname );
continue;
}
if (( tmpfp = fopen( tmpfname, "w")) == NULL ) {
perror( tmpfname );
continue;
}
if ( fwrite( bvals[ i ]->bv_val,
bvals[ i ]->bv_len, 1, tmpfp ) == 0 )
{
perror( tmpfname );
fclose( tmpfp );
continue;
}
fclose( tmpfp );
sprintf( url, "%s%s", urlpre,
&tmpfname[strlen(tmpdir) + sizeof(LDAP_DIRSEP) - 1] );
if ( ldif ) {
write_ldif( LDIF_PUT_URL, a, url, strlen( url ));
} else {
printf( "%s%s%s\n", a, sep, url );
}
} else {
if ( ldif ) {
write_ldif( LDIF_PUT_VALUE, a,
bvals[ i ]->bv_val, bvals[ i ]->bv_len );
} else {
int notprint = !binary && !vals2tmp
&& ldif_is_not_printable( bvals[i]->bv_val,
bvals[i]->bv_len );
printf( "%s%s", a, sep );
puts( notprint ? "NOT PRINTABLE" : bvals[ i ]->bv_val );
}
}
}
ber_bvecfree( bvals );
Initial revision
1998-08-09 08:43:13 +08:00
}
}
Update ldap_first_attribute/ldap_next_attribute to handle BerElement argument per latest IETF ldapext draft c api spec. That is, caller is solely responsible for freeing the BerElement allocated and returned by ldap_first_attribute. Update man pages accordingly. Update applications accordingly.
1999-01-21 04:21:38 +08:00
if( ber != NULL ) {
ber_free( ber, 0 );
}
Initial revision
1998-08-09 08:43:13 +08:00
}
Cleanup: Fix printf formats, remove unused variables, add missing prototypes in slapd, add static/const, add some return types or change to void return type.
1999-09-02 16:05:17 +08:00
static int
Enhance LDIF handling ldapsearch: use draft guidelines for determining when to use -t only writes binary attributes to files -tt writes all attributes to files output now lists URL instead of path to such files -T dir can be used to specify directory to create temp files in -V urlprefix can be used to change the URL prefix LDIF is now commented (can be disabled using -LL) LDIF now contains version attribute (can be disabled with -LLL) LDIF: put interface changed to allow caller to specify how to encode put interface uses draft guidelines for determine when to base64 encode wrapping kludged to match old off by one bug Tests: removed trailing space from some attributes (to avoid base64 encoding) enabled -LLL in defines.sh (should sed output to remove wrapping/comments/redundant separators) Misc: updated codes outputting LDIF to use new put interface TODO: handling of version attribute on input handling of URLs on input (ie: fetch URL)
1999-07-31 07:00:02 +08:00
write_ldif( int type, char *name, char *value, ber_len_t vallen )
Initial revision
1998-08-09 08:43:13 +08:00
{
Enhance LDIF handling ldapsearch: use draft guidelines for determining when to use -t only writes binary attributes to files -tt writes all attributes to files output now lists URL instead of path to such files -T dir can be used to specify directory to create temp files in -V urlprefix can be used to change the URL prefix LDIF is now commented (can be disabled using -LL) LDIF now contains version attribute (can be disabled with -LLL) LDIF: put interface changed to allow caller to specify how to encode put interface uses draft guidelines for determine when to base64 encode wrapping kludged to match old off by one bug Tests: removed trailing space from some attributes (to avoid base64 encoding) enabled -LLL in defines.sh (should sed output to remove wrapping/comments/redundant separators) Misc: updated codes outputting LDIF to use new put interface TODO: handling of version attribute on input handling of URLs on input (ie: fetch URL)
1999-07-31 07:00:02 +08:00
char *ldif;
Initial revision
1998-08-09 08:43:13 +08:00
Enhance LDIF handling ldapsearch: use draft guidelines for determining when to use -t only writes binary attributes to files -tt writes all attributes to files output now lists URL instead of path to such files -T dir can be used to specify directory to create temp files in -V urlprefix can be used to change the URL prefix LDIF is now commented (can be disabled using -LL) LDIF now contains version attribute (can be disabled with -LLL) LDIF: put interface changed to allow caller to specify how to encode put interface uses draft guidelines for determine when to base64 encode wrapping kludged to match old off by one bug Tests: removed trailing space from some attributes (to avoid base64 encoding) enabled -LLL in defines.sh (should sed output to remove wrapping/comments/redundant separators) Misc: updated codes outputting LDIF to use new put interface TODO: handling of version attribute on input handling of URLs on input (ie: fetch URL)
1999-07-31 07:00:02 +08:00
if (( ldif = ldif_put( type, name, value, vallen )) == NULL ) {
return( -1 );
}
Initial revision
1998-08-09 08:43:13 +08:00
Enhance LDIF handling ldapsearch: use draft guidelines for determining when to use -t only writes binary attributes to files -tt writes all attributes to files output now lists URL instead of path to such files -T dir can be used to specify directory to create temp files in -V urlprefix can be used to change the URL prefix LDIF is now commented (can be disabled using -LL) LDIF now contains version attribute (can be disabled with -LLL) LDIF: put interface changed to allow caller to specify how to encode put interface uses draft guidelines for determine when to base64 encode wrapping kludged to match old off by one bug Tests: removed trailing space from some attributes (to avoid base64 encoding) enabled -LLL in defines.sh (should sed output to remove wrapping/comments/redundant separators) Misc: updated codes outputting LDIF to use new put interface TODO: handling of version attribute on input handling of URLs on input (ie: fetch URL)
1999-07-31 07:00:02 +08:00
fputs( ldif, stdout );
ber_memfree( ldif );
Initial revision
1998-08-09 08:43:13 +08:00
Enhance LDIF handling ldapsearch: use draft guidelines for determining when to use -t only writes binary attributes to files -tt writes all attributes to files output now lists URL instead of path to such files -T dir can be used to specify directory to create temp files in -V urlprefix can be used to change the URL prefix LDIF is now commented (can be disabled using -LL) LDIF now contains version attribute (can be disabled with -LLL) LDIF: put interface changed to allow caller to specify how to encode put interface uses draft guidelines for determine when to base64 encode wrapping kludged to match old off by one bug Tests: removed trailing space from some attributes (to avoid base64 encoding) enabled -LLL in defines.sh (should sed output to remove wrapping/comments/redundant separators) Misc: updated codes outputting LDIF to use new put interface TODO: handling of version attribute on input handling of URLs on input (ie: fetch URL)
1999-07-31 07:00:02 +08:00
return( 0 );
Initial revision
1998-08-09 08:43:13 +08:00
}
Reference in New Issue Copy Permalink