]> git.sur5r.net Git - openldap/commitdiff
Move to Attic
authorKurt Zeilenga <kurt@openldap.org>
Fri, 27 Feb 2004 01:23:44 +0000 (01:23 +0000)
committerKurt Zeilenga <kurt@openldap.org>
Fri, 27 Feb 2004 01:23:44 +0000 (01:23 +0000)
servers/slapd/tools/Makefile.in [deleted file]
servers/slapd/tools/mimic.c [deleted file]
servers/slapd/tools/slapadd.c [deleted file]
servers/slapd/tools/slapadd.dsp [deleted file]
servers/slapd/tools/slapcat.c [deleted file]
servers/slapd/tools/slapcat.dsp [deleted file]
servers/slapd/tools/slapcommon.c [deleted file]
servers/slapd/tools/slapcommon.h [deleted file]
servers/slapd/tools/slapindex.c [deleted file]
servers/slapd/tools/slapindex.dsp [deleted file]
servers/slapd/tools/slappasswd.c [deleted file]

diff --git a/servers/slapd/tools/Makefile.in b/servers/slapd/tools/Makefile.in
deleted file mode 100644 (file)
index 5ab1d07..0000000
+++ /dev/null
@@ -1,84 +0,0 @@
-# Makefile.in for slapd tools
-# $OpenLDAP$
-## This work is part of OpenLDAP Software <http://www.openldap.org/>.
-##
-## Copyright 1998-2004 The OpenLDAP Foundation.
-## All rights reserved.
-##
-## Redistribution and use in source and binary forms, with or without
-## modification, are permitted only as authorized by the OpenLDAP
-## Public License.
-##
-## A copy of this license is available in the file LICENSE in the
-## top-level directory of the distribution or, alternatively, at
-## <http://www.OpenLDAP.org/license.html>.
-
-LDAP_INCDIR= ../../../include       
-LDAP_LIBDIR= ../../../libraries
-
-SLAP_DIR=../
-XDEFS = $(MODULES_CPPFLAGS)
-XLDFLAGS = $(MODULES_LDFLAGS)
-
-XLIBS = $(SLAPD_L) $(LDBM_LIBS)
-XXLIBS = $(SLAPD_LIBS) \
-       $(LDBM_LIBS) $(SECURITY_LIBS) $(LUTIL_LIBS)
-XXXLIBS = $(LTHREAD_LIBS)
-SLAPI_DEP_LIBS = $(LIBS) @LIBSLAPITOOLS@ @SLAPI_LIBS@ $(MODULES_LIBS)
-
-STATIC_DEPENDS=@SLAPD_NO_STATIC@ ../libbackends.a
-
-PROGRAMS=slapadd slapcat slapindex slappasswd
-
-SRCS = mimic.c slapcommon.c \
-       slapadd.c slapcat.c slapindex.c slappasswd.c
-
-SLAPD_OBJS = ../globals.o ../config.o ../ch_malloc.o ../cr.o ../backend.o \
-               ../module.o ../aclparse.o ../filterentry.o ../schema.o \
-               ../schema_check.o ../schema_init.o ../schema_prep.o \
-               ../schemaparse.o ../ad.o ../at.o ../mr.o ../oc.o \
-               ../syntax.o ../acl.o ../phonetic.o ../attr.o ../value.o \
-               ../entry.o ../dn.o ../filter.o ../str2filter.o ../ava.o \
-               ../init.o ../controls.o ../passwd.o \
-               ../index.o ../extended.o ../sets.o ../mra.o \
-               ../referral.o ../backglue.o ../oidm.o ../mods.o ../operation.o \
-               ../sl_malloc.o ../backover.o ../ctxcsn.o ../syncrepl.o \
-               ../ldapsync.o ../sessionlog.o
-
-SLAPOBJS = $(SLAPD_OBJS) slapcommon.o mimic.o
-
-all-local: build-progs
-
-build-progs: $(PROGRAMS)
-
-#
-# SLAP Tools
-#
-slapadd:       slapadd.o $(STATIC_DEPENDS) $(SLAPOBJS) $(SLAPD_L) 
-       $(LTLINK) -o $@ slapadd.o $(SLAPOBJS) $(STATIC_DEPENDS) \
-       $(SLAPI_DEP_LIBS)
-
-slapcat:       slapcat.o $(STATIC_DEPENDS) $(SLAPOBJS) $(SLAPD_L) 
-       $(LTLINK) -o $@ slapcat.o $(SLAPOBJS) $(STATIC_DEPENDS) \
-       $(SLAPI_DEP_LIBS)
-
-slapindex:     slapindex.o $(STATIC_DEPENDS) $(SLAPOBJS) $(SLAPD_L) 
-       $(LTLINK) -o $@ slapindex.o $(SLAPOBJS) $(STATIC_DEPENDS) \
-       $(SLAPI_DEP_LIBS)
-
-slappasswd:            slappasswd.o $(SLAPD_L) 
-       $(LTLINK) -o $@ slappasswd.o $(LIBS)
-
-clean-local: FORCE
-       $(RM) $(PROGRAMS) $(XPROGRAMS) $(XSRCS) *.o core .libs/* *.exe
-
-depend-local: FORCE
-       $(MKDEP) $(DEFS) $(DEFINES) $(SRCS)
-
-install-local: FORCE
-       -$(MKDIR) $(DESTDIR)$(sbindir)
-       @for bin in $(PROGRAMS); do \
-               $(LTINSTALL) $(INSTALLFLAGS) -s -m 755 \
-                       $$bin$(EXEEXT) $(DESTDIR)$(sbindir); \
-       done
-
diff --git a/servers/slapd/tools/mimic.c b/servers/slapd/tools/mimic.c
deleted file mode 100644 (file)
index 71830bb..0000000
+++ /dev/null
@@ -1,334 +0,0 @@
-/* $OpenLDAP$ */
-/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
- *
- * Copyright 1998-2004 The OpenLDAP Foundation.
- * Portions Copyright 1998-2003 Kurt D. Zeilenga.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
- *
- * A copy of this license is available in file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
- */
-/* ACKNOWLEDGEMENTS:
- * This work was initially developed by Kurt Zeilenga for inclusion
- * in OpenLDAP Software.
- */
-
-
-/*
- * Mimic unused interfaces of slapd...
- * needed for linking.
- */
-#include "portable.h"
-
-#include <stdio.h>
-
-#include "../slap.h"
-
-#include "ldap_rq.h"
-
-/* needed by WIN32 and back-monitor */
-time_t starttime;
-
-/* because Versionstr is used in back-monitor */
-const char Versionstr[] = "";
-
-/* bogus ../results.c */
-int str2result(
-       char* s,
-       int *code,
-       char **matched,
-       char **info )
-{
-       assert(0);
-    return 0;
-}
-
-void
-send_ldap_disconnect( Operation        *op, SlapReply *rs )
-{
-       assert(0);
-}
-
-int
-slap_null_cb(
-    Operation  *op, SlapReply *rs
-)
-{
-       assert(0);
-}
-
-int
-slap_replog_cb(
-    Operation  *op, SlapReply *rs
-)
-{
-       assert(0);
-}
-
-void
-slap_send_ldap_extended(
-    Operation  *op, SlapReply *rs
-)
-{
-       assert(0);
-}
-
-void
-slap_send_ldap_intermediate_resp(
-       Operation *op, SlapReply *rs
-)
-{
-       assert(0);
-}
-
-void
-send_ldap_sasl( Operation *op, SlapReply *rs )
-{
-       assert(0);
-}
-
-void
-slap_send_ldap_result( Operation *op, SlapReply *rs )
-{
-       assert(0);
-}
-
-int
-slap_send_search_entry( Operation *op, SlapReply *rs )
-{
-       assert(0);
-       return -1;
-}
-
-int
-slap_send_search_reference( Operation *op, SlapReply *rs )
-{
-       assert(0);
-       return -1;
-}
-
-int slap_read_controls(
-       Operation *op,
-       SlapReply *rs,
-       Entry *e,
-       const struct berval *oid,
-       LDAPControl **c )
-{
-       assert(0);
-       return -1;
-}
-
-int slap_sasl_init(void)
-{
-       return LDAP_SUCCESS;
-}
-
-int slap_sasl_destroy(void)
-{
-       return LDAP_SUCCESS;
-}
-
-int slap_sasl_setpass( Operation *op, SlapReply *rs )
-{
-       return LDAP_SUCCESS;
-}
-
-int slap_sasl_config(
-       int cargc,
-       char **cargv,
-       char *line,
-       const char *fname,
-       int lineno )
-{
-       return LDAP_SUCCESS;
-}
-
-
-int connection_client_setup(
-       ber_socket_t s,
-       Listener *l,
-       ldap_pvt_thread_start_t *func,
-       void *arg )
-{
-       assert(0);
-       return 0;
-}
-
-void connection_client_enable( ber_socket_t s )
-{
-       assert(0);
-}
-
-void connection_client_stop( ber_socket_t s )
-{
-       assert(0);
-}
-
-void connection2anonymous( Connection *c )
-{
-       assert(0);
-}
-
-Connection * connection_first( ber_socket_t *b )
-{
-       assert(0);
-       return NULL;
-}
-
-Connection * connection_next( Connection *c, ber_socket_t *b )
-{
-       assert(0);
-       return NULL;
-}
-
-unsigned long connections_nextid(void)
-{
-       return 0;
-}
-
-void connection_done( Connection *c )
-{
-       assert(0);
-}
-
-const char * connection_state2str( int state )
-{
-       assert(0);
-       return NULL;
-}
-
-void replog( Operation *op )
-{
-       assert(0);
-}
-
-int add_replica_info( Backend *be, const char *host )
-{
-       return 0;
-}
-
-int add_replica_suffix( Backend *be, int nr, const char *suffix )
-{
-       return 0;
-}
-
-int add_replica_attrs( Backend *be, int nr, char *attrs, int exclude )
-{
-       return 0;
-}
-
-int parse_limits( Backend *be, const char *fname, int lineno, int argc, char **argv )
-{
-       return 0;
-}
-
-int parse_limit( const char *arg, struct slap_limits_set *limit )
-{
-       return 0;
-}
-
-int get_limits( Operation *op, struct berval *ndn, struct slap_limits_set **limit )
-{
-       return 0;
-}
-
-int read_root_dse_file ( const char *file )
-{
-       return 0;
-}
-
-Attribute *
-slap_operational_subschemaSubentry( Backend *be )
-{
-       return NULL;
-}
-
-Attribute *
-slap_operational_hasSubordinate( int hs )
-{
-       return NULL;
-}
-
-Listener **
-slapd_get_listeners(void)
-{
-       return NULL;
-}
-
-int
-slap_modrdn2mods(
-       Operation       *op, SlapReply *rs,
-       Entry           *e,
-       LDAPRDN         oldrdn,
-       LDAPRDN         newrdn,
-       Modifications   **pmod )
-{
-       return 0;
-}
-
-int slap_sasl_getdn( Connection *conn, Operation *op, char *id, int len,
-       char *user_realm, struct berval *dn, int flags )
-{
-       return -1;
-}
-
-int slap_sasl_authorized( Operation *op,
-       struct berval *authcDN, struct berval *authzDN )
-{
-       return -1;
-}
-
-int root_dse_info( Connection *conn, Entry **entry, const char **text )
-{
-       return -1;
-}
-
-int slap_entry2mods( Entry *e, Modifications **mods, const char **text,
-                                        char *textbuf, size_t textlen )
-{
-       return -1;
-}
-
-volatile sig_atomic_t slapd_shutdown;
-
-int slap_mods_check( Modifications *ml, int update, const char **text,
-               char *textbuf, size_t textlen, void *ctx )
-{
-       return -1;
-}
-
-int slap_mods2entry( Modifications *mods, Entry **e, int repl_user,
-               int dup, const char **text, char *textbuf, size_t textlen )
-{
-       return -1;
-}
-
-int slap_mods_opattrs( Operation *op, Modifications *mods,
-               Modifications **modtail, const char **text,
-               char *textbuf, size_t textlen )
-{
-       return -1;
-}
-
-int slap_parse_user( struct berval *id, struct berval *user,
-               struct berval *realm, struct berval *mech )
-{
-       return -1;
-}
-
-int cancel_extop( Operation *op, SlapReply *rs )
-{
-       return -1;
-}
-
-#ifdef HAVE_TLS
-int starttls_extop ( Operation *op, SlapReply *rs )
-{
-       return -1;
-}
-#endif
diff --git a/servers/slapd/tools/slapadd.c b/servers/slapd/tools/slapadd.c
deleted file mode 100644 (file)
index 5273991..0000000
+++ /dev/null
@@ -1,691 +0,0 @@
-/* $OpenLDAP$ */
-/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
- *
- * Copyright 1998-2004 The OpenLDAP Foundation.
- * Portions Copyright 1998-2003 Kurt D. Zeilenga.
- * Portions Copyright 2003 IBM Corporation.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
- *
- * A copy of this license is available in file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
- */
-/* ACKNOWLEDGEMENTS:
- * This work was initially developed by Kurt Zeilenga for inclusion
- * in OpenLDAP Software.  Additional signficant contributors include
- *    Jong Hyuk Choi
- *    Pierangelo Masarati
- */
-
-#include "portable.h"
-
-#include <stdio.h>
-
-#include <ac/stdlib.h>
-
-#include <ac/ctype.h>
-#include <ac/string.h>
-#include <ac/socket.h>
-#include <ac/unistd.h>
-
-#include <lber.h>
-#include <ldif.h>
-#include <lutil.h>
-
-#include "slapcommon.h"
-
-static char csnbuf[ LDAP_LUTIL_CSNSTR_BUFSIZE ];
-static const struct berval slap_syncrepl_bvc = BER_BVC("syncreplxxx");
-static const struct berval slap_syncrepl_cn_bvc = BER_BVC("cn=syncreplxxx");
-static struct berval slap_syncrepl_bv = BER_BVNULL;
-static struct berval slap_syncrepl_cn_bv = BER_BVNULL;
-
-struct subentryinfo {
-       struct berval cn;
-       struct berval ndn;
-       struct berval rdn;
-       struct berval cookie;
-       LDAP_SLIST_ENTRY( subentryinfo ) sei_next;
-};
-
-int
-main( int argc, char **argv )
-{
-       char            *buf = NULL;
-       int         lineno;
-       int         lmax;
-       int                     rc = EXIT_SUCCESS;
-
-       const char *text;
-       char textbuf[SLAP_TEXT_BUFLEN] = { '\0' };
-       size_t textlen = sizeof textbuf;
-
-       struct berval csn;
-       struct berval maxcsn = { 0, NULL };
-       struct berval ldifcsn = { 0, NULL };
-       int match;
-       int     provider_subentry = 0;
-       struct subentryinfo *sei;
-       LDAP_SLIST_HEAD( consumer_subentry_slist, subentryinfo ) consumer_subentry;
-       Attribute *attr;
-       Entry *ctxcsn_e;
-       ID      ctxcsn_id;
-       struct berval   ctxcsn_ndn = { 0, NULL };
-       int ret;
-       struct berval bvtext;
-       int i;
-#ifdef NEW_LOGGING
-       lutil_log_initialize(argc, argv );
-#endif
-       slap_tool_init( "slapadd", SLAPADD, argc, argv );
-
-       LDAP_SLIST_INIT( &consumer_subentry );
-
-       if( !be->be_entry_open ||
-               !be->be_entry_close ||
-               !be->be_entry_put )
-       {
-               fprintf( stderr, "%s: database doesn't support necessary operations.\n",
-                       progname );
-               exit( EXIT_FAILURE );
-       }
-
-       lmax = 0;
-       lineno = 0;
-
-       if( be->be_entry_open( be, 1 ) != 0 ) {
-               fprintf( stderr, "%s: could not open database.\n",
-                       progname );
-               exit( EXIT_FAILURE );
-       }
-
-       while( ldif_read_record( ldiffp, &lineno, &buf, &lmax ) ) {
-               Entry *e = str2entry( buf );
-
-               /*
-                * Initialize text buffer
-                */
-               bvtext.bv_len = textlen;
-               bvtext.bv_val = textbuf;
-               bvtext.bv_val[0] = '\0';
-
-               if( e == NULL ) {
-                       fprintf( stderr, "%s: could not parse entry (line=%d)\n",
-                               progname, lineno );
-                       rc = EXIT_FAILURE;
-                       if( continuemode ) continue;
-                       break;
-               }
-
-               /* make sure the DN is not empty */
-               if( !e->e_nname.bv_len ) {
-                       fprintf( stderr, "%s: empty dn=\"%s\" (line=%d)\n",
-                               progname, e->e_dn, lineno );
-                       rc = EXIT_FAILURE;
-                       entry_free( e );
-                       if( continuemode ) continue;
-                       break;
-               }
-
-               /* check backend */
-               if( select_backend( &e->e_nname, is_entry_referral(e), nosubordinates )
-                       != be )
-               {
-                       fprintf( stderr, "%s: line %d: "
-                               "database (%s) not configured to hold \"%s\"\n",
-                               progname, lineno,
-                               be ? be->be_suffix[0].bv_val : "<none>",
-                               e->e_dn );
-                       fprintf( stderr, "%s: line %d: "
-                               "database (%s) not configured to hold \"%s\"\n",
-                               progname, lineno,
-                               be ? be->be_nsuffix[0].bv_val : "<none>",
-                               e->e_ndn );
-                       rc = EXIT_FAILURE;
-                       entry_free( e );
-                       if( continuemode ) continue;
-                       break;
-               }
-
-               if( global_schemacheck ) {
-                       Attribute *sc = attr_find( e->e_attrs,
-                               slap_schema.si_ad_structuralObjectClass );
-                       Attribute *oc = attr_find( e->e_attrs,
-                               slap_schema.si_ad_objectClass );
-
-                       if( oc == NULL ) {
-                               fprintf( stderr, "%s: dn=\"%s\" (line=%d): %s\n",
-                                       progname, e->e_dn, lineno,
-                                       "no objectClass attribute");
-                               rc = EXIT_FAILURE;
-                               entry_free( e );
-                               if( continuemode ) continue;
-                               break;
-                       }
-
-                       if( sc == NULL ) {
-                               struct berval vals[2];
-
-                               rc = structural_class( oc->a_vals, vals,
-                                       NULL, &text, textbuf, textlen );
-
-                               if( rc != LDAP_SUCCESS ) {
-                                       fprintf( stderr, "%s: dn=\"%s\" (line=%d): (%d) %s\n",
-                                               progname, e->e_dn, lineno, rc, text );
-                                       rc = EXIT_FAILURE;
-                                       entry_free( e );
-                                       if( continuemode ) continue;
-                                       break;
-                               }
-
-                               vals[1].bv_len = 0;
-                               vals[1].bv_val = NULL;
-
-                               attr_merge( e, slap_schema.si_ad_structuralObjectClass,
-                                       vals, NULL /* FIXME */ );
-                       }
-
-                       /* check schema */
-                       rc = entry_schema_check( be, e, NULL, &text, textbuf, textlen );
-
-                       if( rc != LDAP_SUCCESS ) {
-                               fprintf( stderr, "%s: dn=\"%s\" (line=%d): (%d) %s\n",
-                                       progname, e->e_dn, lineno, rc, text );
-                               rc = EXIT_FAILURE;
-                               entry_free( e );
-                               if( continuemode ) continue;
-                               break;
-                       }
-               }
-
-               if ( SLAP_LASTMOD(be) ) {
-                       struct tm *ltm;
-                       time_t now = slap_get_time();
-                       char uuidbuf[ LDAP_LUTIL_UUIDSTR_BUFSIZE ];
-                       struct berval vals[ 2 ];
-
-                       struct berval name, timestamp;
-
-                       struct berval nvals[ 2 ];
-                       struct berval nname;
-                       char timebuf[ LDAP_LUTIL_GENTIME_BUFSIZE ];
-
-                       vals[1].bv_len = 0;
-                       vals[1].bv_val = NULL;
-
-                       nvals[1].bv_len = 0;
-                       nvals[1].bv_val = NULL;
-
-                       ltm = gmtime(&now);
-                       lutil_gentime( timebuf, sizeof(timebuf), ltm );
-
-                       csn.bv_len = lutil_csnstr( csnbuf, sizeof( csnbuf ), 0, 0 );
-                       csn.bv_val = csnbuf;
-
-                       timestamp.bv_val = timebuf;
-                       timestamp.bv_len = strlen(timebuf);
-
-                       if ( be->be_rootndn.bv_len == 0 ) {
-                               name.bv_val = SLAPD_ANONYMOUS;
-                               name.bv_len = sizeof(SLAPD_ANONYMOUS) - 1;
-                               nname.bv_val = SLAPD_ANONYMOUS;
-                               nname.bv_len = sizeof(SLAPD_ANONYMOUS) - 1;
-                       } else {
-                               name = be->be_rootdn;
-                               nname = be->be_rootndn;
-                       }
-
-                       if( attr_find( e->e_attrs, slap_schema.si_ad_entryUUID )
-                               == NULL )
-                       {
-                               vals[0].bv_len = lutil_uuidstr( uuidbuf, sizeof( uuidbuf ) );
-                               vals[0].bv_val = uuidbuf;
-                               attr_merge_normalize_one( e,
-                                                       slap_schema.si_ad_entryUUID, vals, NULL );
-                       }
-
-                       if( attr_find( e->e_attrs, slap_schema.si_ad_creatorsName )
-                               == NULL )
-                       {
-                               vals[0] = name;
-                               nvals[0] = nname;
-                               attr_merge( e, slap_schema.si_ad_creatorsName, vals, nvals );
-                       }
-
-                       if( attr_find( e->e_attrs, slap_schema.si_ad_modifiersName )
-                               == NULL )
-                       {
-                               vals[0] = name;
-                               nvals[0] = nname;
-                               attr_merge( e, slap_schema.si_ad_modifiersName, vals, nvals );
-                       }
-
-                       if( attr_find( e->e_attrs, slap_schema.si_ad_createTimestamp )
-                               == NULL )
-                       {
-                               vals[0] = timestamp;
-                               attr_merge( e, slap_schema.si_ad_createTimestamp, vals, NULL );
-                       }
-
-                       if( attr_find( e->e_attrs, slap_schema.si_ad_modifyTimestamp )
-                               == NULL )
-                       {
-                               vals[0] = timestamp;
-                               attr_merge( e, slap_schema.si_ad_modifyTimestamp, vals, NULL );
-                       }
-
-                       if( attr_find( e->e_attrs, slap_schema.si_ad_entryCSN )
-                               == NULL )
-                       {
-                               vals[0] = csn;
-                               attr_merge( e, slap_schema.si_ad_entryCSN, vals, NULL );
-                       }
-
-                       if ( !is_entry_syncProviderSubentry( e ) &&
-                                !is_entry_syncConsumerSubentry( e ) &&
-                                update_ctxcsn != SLAP_TOOL_CTXCSN_KEEP ) {
-                               attr = attr_find( e->e_attrs, slap_schema.si_ad_entryCSN );
-                               if ( maxcsn.bv_len != 0 ) {
-                                       value_match( &match, slap_schema.si_ad_entryCSN,
-                                               slap_schema.si_ad_entryCSN->ad_type->sat_ordering,
-                                               SLAP_MR_VALUE_OF_ATTRIBUTE_SYNTAX,
-                                               &maxcsn, &attr->a_nvals[0], &text );
-                               } else {
-                                       match = -1;
-                               }
-                               if ( match < 0 ) {
-                                       if ( maxcsn.bv_val )
-                                               ch_free( maxcsn.bv_val );
-                                       ber_dupbv( &maxcsn, &attr->a_nvals[0] );
-                               }
-                       }
-               }
-
-               if ( update_ctxcsn == SLAP_TOOL_CTXCSN_KEEP &&
-                       ( replica_promotion || replica_demotion )) {
-                       if ( is_entry_syncProviderSubentry( e )) { 
-                               if ( !LDAP_SLIST_EMPTY( &consumer_subentry )) {
-                                       fprintf( stderr, "%s: consumer and provider subentries "
-                                                                        "are both present\n", progname );
-                                       rc = EXIT_FAILURE;
-                                       entry_free( e );
-                                       sei = LDAP_SLIST_FIRST( &consumer_subentry );
-                                       while ( sei ) {
-                                               ch_free( sei->cn.bv_val );
-                                               ch_free( sei->ndn.bv_val );
-                                               ch_free( sei->rdn.bv_val );
-                                               ch_free( sei->cookie.bv_val );
-                                               LDAP_SLIST_REMOVE_HEAD( &consumer_subentry, sei_next );
-                                               ch_free( sei );
-                                               sei = LDAP_SLIST_FIRST( &consumer_subentry );
-                                       }
-                                       break;
-                               }
-                               if ( provider_subentry ) {
-                                       fprintf( stderr, "%s: multiple provider subentries are "
-                                                       "present : add -w flag to refresh\n", progname );
-                                       rc = EXIT_FAILURE;
-                                       entry_free( e );
-                                       break;
-                               }
-                               attr = attr_find( e->e_attrs, slap_schema.si_ad_contextCSN );
-                               if ( attr == NULL ) {
-                                       entry_free( e );
-                                       continue;
-                               }
-                               provider_subentry = 1;
-                               ber_dupbv( &maxcsn, &attr->a_nvals[0] );
-                       } else if ( is_entry_syncConsumerSubentry( e )) {
-                               if ( provider_subentry ) {
-                                       fprintf( stderr, "%s: consumer and provider subentries "
-                                                                        "are both present\n", progname );
-                                       rc = EXIT_FAILURE;
-                                       entry_free( e );
-                                       break;
-                               }
-
-                               attr = attr_find( e->e_attrs, slap_schema.si_ad_cn );
-
-                               if ( attr == NULL ) {
-                                       entry_free( e );
-                                       continue;
-                               }
-
-                               if ( !LDAP_SLIST_EMPTY( &consumer_subentry )) {
-                                       LDAP_SLIST_FOREACH( sei, &consumer_subentry, sei_next ) {
-                                               value_match( &match, slap_schema.si_ad_cn,
-                                                       slap_schema.si_ad_cn->ad_type->sat_equality,
-                                                       SLAP_MR_VALUE_OF_ATTRIBUTE_SYNTAX,
-                                                       &sei->cn, &attr->a_nvals[0], &text );
-                                       }
-                                       if ( !match ) {
-                                               fprintf( stderr, "%s: multiple consumer subentries "
-                                                               "have the same id : add -w flag to refresh\n",
-                                                               progname );
-                                               rc = EXIT_FAILURE;
-                                               entry_free( e );
-                                               sei = LDAP_SLIST_FIRST( &consumer_subentry );
-                                               while ( sei ) {
-                                                       ch_free( sei->cn.bv_val );
-                                                       ch_free( sei->ndn.bv_val );
-                                                       ch_free( sei->rdn.bv_val );
-                                                       ch_free( sei->cookie.bv_val );
-                                                       LDAP_SLIST_REMOVE_HEAD( &consumer_subentry, sei_next );
-                                                       ch_free( sei );
-                                                       sei = LDAP_SLIST_FIRST( &consumer_subentry );
-                                               }
-                                               break;
-                                       }
-                               }
-                               sei = ch_calloc( 1, sizeof( struct subentryinfo ));
-                               ber_dupbv( &sei->cn, &attr->a_nvals[0] );
-                               ber_dupbv( &sei->ndn, &e->e_nname );
-                               dnExtractRdn( &sei->ndn, &sei->rdn, NULL );
-                               attr = attr_find( e->e_attrs, slap_schema.si_ad_syncreplCookie );
-                               if ( attr == NULL ) {
-                                       ch_free( sei->cn.bv_val );
-                                       ch_free( sei->ndn.bv_val );
-                                       ch_free( sei->rdn.bv_val );
-                                       ch_free( sei->cookie.bv_val );
-                                       ch_free( sei );
-                                       entry_free( e );
-                                       continue;
-                               }
-                               ber_dupbv( &sei->cookie, &attr->a_nvals[0] );
-                               LDAP_SLIST_INSERT_HEAD( &consumer_subentry, sei, sei_next );
-                       }
-               }
-
-               if (( !is_entry_syncProviderSubentry( e ) &&
-                        !is_entry_syncConsumerSubentry( e )) ||
-                        ( !replica_promotion && !replica_demotion )) {
-                       if (!dryrun) {
-                               ID id = be->be_entry_put( be, e, &bvtext );
-                               if( id == NOID ) {
-                                       fprintf( stderr, "%s: could not add entry dn=\"%s\" "
-                                                                        "(line=%d): %s\n", progname, e->e_dn,
-                                                                        lineno, bvtext.bv_val );
-                                       rc = EXIT_FAILURE;
-                                       entry_free( e );
-                                       if( continuemode ) continue;
-                                       break;
-                               }
-       
-                               if ( verbose ) {
-                                       fprintf( stderr, "added: \"%s\" (%08lx)\n",
-                                               e->e_dn, (long) id );
-                               }
-                       } else {
-                               if ( verbose ) {
-                                       fprintf( stderr, "(dry) added: \"%s\"\n", e->e_dn );
-                               }
-                       }
-               }
-
-               entry_free( e );
-       }
-
-       bvtext.bv_len = textlen;
-       bvtext.bv_val = textbuf;
-       bvtext.bv_val[0] = '\0';
-
-       if ( !LDAP_SLIST_EMPTY( &consumer_subentry )) {
-               maxcsn.bv_len = 0;
-               maxcsn.bv_val = NULL;
-               LDAP_SLIST_FOREACH( sei, &consumer_subentry, sei_next ) {
-                       if ( maxcsn.bv_len != 0 ) {
-                               value_match( &match, slap_schema.si_ad_syncreplCookie,
-                                       slap_schema.si_ad_syncreplCookie->ad_type->sat_ordering,
-                                       SLAP_MR_VALUE_OF_ATTRIBUTE_SYNTAX,
-                                       &maxcsn, &sei->cookie, &text );
-                       } else {
-                               match = -1;
-                       }
-                       if ( match < 0 ) {
-                               if ( maxcsn.bv_val )
-                                       ch_free( maxcsn.bv_val );
-                               ber_dupbv( &maxcsn, &sei->cookie );
-                       }
-               }
-       }
-
-       if ( SLAP_LASTMOD(be) && replica_promotion ) {
-               if ( provider_subentry || update_ctxcsn == SLAP_TOOL_CTXCSN_BATCH ||
-                        !LDAP_SLIST_EMPTY( &consumer_subentry )) {
-                       build_new_dn( &ctxcsn_ndn, &be->be_nsuffix[0],
-                                                 (struct berval *)&slap_ldapsync_cn_bv, NULL );
-                       ctxcsn_id = be->be_dn2id_get( be, &ctxcsn_ndn );
-               
-                       if ( ctxcsn_id == NOID ) {
-                               ctxcsn_e = slap_create_context_csn_entry( be, &maxcsn );
-                               if ( !dryrun ) {
-                                       ctxcsn_id = be->be_entry_put( be, ctxcsn_e, &bvtext );
-                                       if( ctxcsn_id == NOID ) {
-                                               fprintf( stderr, "%s: could not add ctxcsn subentry\n",
-                                                                                progname);
-                                               rc = EXIT_FAILURE;
-                                       }
-                                       if ( verbose ) {
-                                               fprintf( stderr, "added: \"%s\" (%08lx)\n",
-                                                                                ctxcsn_e->e_dn, (long) ctxcsn_id );
-                                       }
-                               } else {
-                                       if ( verbose ) {
-                                               fprintf( stderr, "(dry) added: \"%s\"\n", ctxcsn_e->e_dn );
-                                       }
-                               }
-                               entry_free( ctxcsn_e );
-                       } else {
-                               ret = be->be_id2entry_get( be, ctxcsn_id, &ctxcsn_e );
-                               if ( ret == LDAP_SUCCESS ) {
-                                       attr = attr_find( ctxcsn_e->e_attrs,
-                                                                               slap_schema.si_ad_contextCSN );
-                                       AC_MEMCPY( attr->a_vals[0].bv_val, maxcsn.bv_val, maxcsn.bv_len );
-                                       attr->a_vals[0].bv_val[maxcsn.bv_len] = '\0';
-                                       attr->a_vals[0].bv_len = maxcsn.bv_len;
-                                       if ( !dryrun ) {
-                                               ctxcsn_id = be->be_entry_modify( be, ctxcsn_e, &bvtext );
-                                               if( ctxcsn_id == NOID ) {
-                                                       fprintf( stderr, "%s: could not modify ctxcsn "
-                                                                                        "subentry\n", progname);
-                                                       rc = EXIT_FAILURE;
-                                               }
-                                               if ( verbose ) {
-                                                       fprintf( stderr, "modified: \"%s\" (%08lx)\n",
-                                                                                        ctxcsn_e->e_dn, (long) ctxcsn_id );
-                                               }
-                                       } else {
-                                               if ( verbose ) {
-                                                       fprintf( stderr, "(dry) modified: \"%s\"\n",
-                                                                                        ctxcsn_e->e_dn );
-                                               }
-                                       }
-                               } else {
-                                       fprintf( stderr, "%s: could not modify ctxcsn subentry\n",
-                                                                        progname);
-                                       rc = EXIT_FAILURE;
-                               }
-                       }
-               } 
-       } else if ( SLAP_LASTMOD(be) && replica_demotion &&
-                               ( update_ctxcsn == SLAP_TOOL_CTXCSN_BATCH ||
-                               provider_subentry )) {
-
-               ber_dupbv( &slap_syncrepl_bv, (struct berval *) &slap_syncrepl_bvc );
-               ber_dupbv( &slap_syncrepl_cn_bv,
-                                       (struct berval *) &slap_syncrepl_cn_bvc );
-
-               if ( replica_id_list == NULL ) {
-                       replica_id_list = ch_calloc( 2, sizeof( int ));
-                       replica_id_list[0] = 0;
-                       replica_id_list[1] = -1;
-               }
-
-               for ( i = 0; replica_id_list[i] > -1 ; i++ ) {
-                       slap_syncrepl_bv.bv_len = snprintf( slap_syncrepl_bv.bv_val,
-                                                                       slap_syncrepl_bvc.bv_len,
-                                                                       "syncrepl%d", replica_id_list[i] );
-                       slap_syncrepl_cn_bv.bv_len = snprintf( slap_syncrepl_cn_bv.bv_val,
-                                                                               slap_syncrepl_cn_bvc.bv_len,
-                                                                               "cn=syncrepl%d", replica_id_list[i] );
-                       build_new_dn( &ctxcsn_ndn, &be->be_nsuffix[0],
-                                                 (struct berval *)&slap_syncrepl_cn_bv, NULL );
-                       ctxcsn_id = be->be_dn2id_get( be, &ctxcsn_ndn );
-
-                       if ( ctxcsn_id == NOID ) {
-                               ctxcsn_e = slap_create_syncrepl_entry( be, &maxcsn,
-                                                                                               &slap_syncrepl_cn_bv,
-                                                                                               &slap_syncrepl_bv );
-                               if ( !dryrun ) {
-                                       ctxcsn_id = be->be_entry_put( be, ctxcsn_e, &bvtext );
-                                       if( ctxcsn_id == NOID ) {
-                                               fprintf( stderr, "%s: could not add ctxcsn subentry\n",
-                                                                                progname);
-                                               rc = EXIT_FAILURE;
-                                       }
-                                       if ( verbose ) {
-                                               fprintf( stderr, "added: \"%s\" (%08lx)\n",
-                                                                                ctxcsn_e->e_dn, (long) ctxcsn_id );
-                                       }
-                               } else {
-                                       if ( verbose ) {
-                                               fprintf( stderr, "(dry) added: \"%s\"\n",
-                                                                                       ctxcsn_e->e_dn );
-                                       }
-                               }
-                               entry_free( ctxcsn_e );
-                       } else {
-                               ret = be->be_id2entry_get( be, ctxcsn_id, &ctxcsn_e );
-                               if ( ret == LDAP_SUCCESS ) {
-                                       attr = attr_find( ctxcsn_e->e_attrs,
-                                                                         slap_schema.si_ad_syncreplCookie );
-                                       AC_MEMCPY( attr->a_vals[0].bv_val, maxcsn.bv_val, maxcsn.bv_len );
-                                       attr->a_vals[0].bv_val[maxcsn.bv_len] = '\0';
-                                       attr->a_vals[0].bv_len = maxcsn.bv_len;
-                                       if ( !dryrun ) {
-                                               ctxcsn_id = be->be_entry_modify( be,
-                                                                                       ctxcsn_e, &bvtext );
-                                               if( ctxcsn_id == NOID ) {
-                                                       fprintf( stderr, "%s: could not modify ctxcsn "
-                                                                                        "subentry\n", progname);
-                                                       rc = EXIT_FAILURE;
-                                               }
-                                               if ( verbose ) {
-                                                       fprintf( stderr, "modified: \"%s\" (%08lx)\n",
-                                                                                        ctxcsn_e->e_dn, (long) ctxcsn_id );
-                                               }
-                                       } else {
-                                               if ( verbose ) {
-                                                       fprintf( stderr, "(dry) modified: \"%s\"\n",
-                                                                                        ctxcsn_e->e_dn );
-                                               }
-                                       }
-                               } else {
-                                       fprintf( stderr, "%s: could not modify ctxcsn subentry\n",
-                                                                        progname);
-                                       rc = EXIT_FAILURE;
-                               }
-                       }
-               }
-               
-               if ( slap_syncrepl_bv.bv_val ) {
-                       ch_free( slap_syncrepl_bv.bv_val );
-               }
-               if ( slap_syncrepl_cn_bv.bv_val ) {
-                       ch_free( slap_syncrepl_cn_bv.bv_val );
-               }
-       } else if ( SLAP_LASTMOD(be) && replica_demotion &&
-                               !LDAP_SLIST_EMPTY( &consumer_subentry )) {
-
-               LDAP_SLIST_FOREACH( sei, &consumer_subentry, sei_next ) {
-                       ctxcsn_id = be->be_dn2id_get( be, &sei->ndn );
-
-                       if ( ctxcsn_id == NOID ) {
-                               ctxcsn_e = slap_create_syncrepl_entry( be, &sei->cookie,
-                                                                                               &sei->rdn, &sei->cn );
-                               if ( !dryrun ) {
-                                       ctxcsn_id = be->be_entry_put( be, ctxcsn_e, &bvtext );
-                                       if( ctxcsn_id == NOID ) {
-                                               fprintf( stderr, "%s: could not add ctxcsn subentry\n",
-                                                                                progname);
-                                               rc = EXIT_FAILURE;
-                                       }
-                                       if ( verbose ) {
-                                               fprintf( stderr, "added: \"%s\" (%08lx)\n",
-                                                                                ctxcsn_e->e_dn, (long) ctxcsn_id );
-                                       }
-                               } else {
-                                       if ( verbose ) {
-                                               fprintf( stderr, "(dry) added: \"%s\"\n",
-                                                                                       ctxcsn_e->e_dn );
-                                       }
-                               }
-                               entry_free( ctxcsn_e );
-                       } else {
-                               ret = be->be_id2entry_get( be, ctxcsn_id, &ctxcsn_e );
-                               if ( ret == LDAP_SUCCESS ) {
-                                       attr = attr_find( ctxcsn_e->e_attrs,
-                                                                         slap_schema.si_ad_syncreplCookie );
-                                       AC_MEMCPY( attr->a_vals[0].bv_val, maxcsn.bv_val, maxcsn.bv_len );
-                                       attr->a_vals[0].bv_val[maxcsn.bv_len] = '\0';
-                                       attr->a_vals[0].bv_len = maxcsn.bv_len;
-                                       if ( !dryrun ) {
-                                               ctxcsn_id = be->be_entry_modify( be,
-                                                                                       ctxcsn_e, &bvtext );
-                                               if( ctxcsn_id == NOID ) {
-                                                       fprintf( stderr, "%s: could not modify ctxcsn "
-                                                                                        "subentry\n", progname);
-                                                       rc = EXIT_FAILURE;
-                                               }
-                                               if ( verbose ) {
-                                                       fprintf( stderr, "modified: \"%s\" (%08lx)\n",
-                                                                                        ctxcsn_e->e_dn, (long) ctxcsn_id );
-                                               }
-                                       } else {
-                                               if ( verbose ) {
-                                                       fprintf( stderr, "(dry) modified: \"%s\"\n",
-                                                                                        ctxcsn_e->e_dn );
-                                               }
-                                       }
-                               } else {
-                                       fprintf( stderr, "%s: could not modify ctxcsn subentry\n",
-                                                                        progname);
-                                       rc = EXIT_FAILURE;
-                               }
-                       }
-               }
-               
-               if ( slap_syncrepl_bv.bv_val ) {
-                       ch_free( slap_syncrepl_bv.bv_val );
-               }
-               if ( slap_syncrepl_cn_bv.bv_val ) {
-                       ch_free( slap_syncrepl_cn_bv.bv_val );
-               }
-       }
-
-       sei = LDAP_SLIST_FIRST( &consumer_subentry );
-       while ( sei ) {
-               ch_free( sei->cn.bv_val );
-               ch_free( sei->ndn.bv_val );
-               ch_free( sei->rdn.bv_val );
-               ch_free( sei->cookie.bv_val );
-               LDAP_SLIST_REMOVE_HEAD( &consumer_subentry, sei_next );
-               ch_free( sei );
-               sei = LDAP_SLIST_FIRST( &consumer_subentry );
-       }
-
-       ch_free( buf );
-
-       if( be->be_entry_close( be )) rc = EXIT_FAILURE;
-
-       if( be->be_sync ) {
-               be->be_sync( be );
-       }
-
-       slap_tool_destroy();
-       return rc;
-}
diff --git a/servers/slapd/tools/slapadd.dsp b/servers/slapd/tools/slapadd.dsp
deleted file mode 100644 (file)
index 88e6c5d..0000000
+++ /dev/null
@@ -1,157 +0,0 @@
-# Microsoft Developer Studio Project File - Name="slapadd" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 5.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=slapadd - Win32 Single Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "slapadd.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "slapadd.mak" CFG="slapadd - Win32 Single Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "slapadd - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "slapadd - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "slapadd - Win32 Single Debug" (based on\
- "Win32 (x86) Console Application")
-!MESSAGE "slapadd - Win32 Single Release" (based on\
- "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "slapadd - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\..\Release"
-# PROP Intermediate_Dir "..\..\..\Release\slapadd"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\..\..\include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 sasl.lib libdb40.lib rpcrt4.lib hs_regex.lib libsasl.lib ws2_32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\Release"
-
-!ELSEIF  "$(CFG)" == "slapadd - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "ldif2"
-# PROP BASE Intermediate_Dir "ldif2"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\..\Debug"
-# PROP Intermediate_Dir "..\..\..\Debug\slapadd"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\..\..\include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 libdb40d.lib rpcrt4.lib hs_regex.lib libsasl.lib ws2_32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\Debug"
-
-!ELSEIF  "$(CFG)" == "slapadd - Win32 Single Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "ldif2"
-# PROP BASE Intermediate_Dir "ldif2"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\..\SDebug"
-# PROP Intermediate_Dir "..\..\..\SDebug\slapadd"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\..\..\include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /Gm /GX /Zi /Od /I "..\..\..\include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hs_regexd.lib libdbs.lib ws2_32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 libdb32.lib rpcrt4.lib hs_regex.lib libsasl.lib ws2_32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\SDebug"
-
-!ELSEIF  "$(CFG)" == "slapadd - Win32 Single Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "ldif2id0"
-# PROP BASE Intermediate_Dir "ldif2id0"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\..\SRelease"
-# PROP Intermediate_Dir "..\..\..\SRelease\slapadd"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MT /W3 /GX /O2 /I "..\..\..\include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "..\..\..\include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 hs_regex.lib libdb.lib ws2_32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 libdbs.lib libdb32.lib hs_regex.lib libsasl.lib ws2_32.lib rpcrt4.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\SRelease"
-
-!ENDIF 
-
-# Begin Target
-
-# Name "slapadd - Win32 Release"
-# Name "slapadd - Win32 Debug"
-# Name "slapadd - Win32 Single Debug"
-# Name "slapadd - Win32 Single Release"
-# Begin Source File
-
-SOURCE=.\mimic.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\slapadd.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\slapcommon.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\slapcommon.h
-# End Source File
-# End Target
-# End Project
diff --git a/servers/slapd/tools/slapcat.c b/servers/slapd/tools/slapcat.c
deleted file mode 100644 (file)
index 7d985a3..0000000
+++ /dev/null
@@ -1,117 +0,0 @@
-/* $OpenLDAP$ */
-/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
- *
- * Copyright 1998-2004 The OpenLDAP Foundation.
- * Portions Copyright 1998-2003 Kurt D. Zeilenga.
- * Portions Copyright 2003 IBM Corporation.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
- *
- * A copy of this license is available in file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
- */
-/* ACKNOWLEDGEMENTS:
- * This work was initially developed by Kurt Zeilenga for inclusion
- * in OpenLDAP Software.  Additional signficant contributors include
- *    Jong Hyuk Choi
- */
-
-#include "portable.h"
-
-#include <stdio.h>
-
-#include <ac/stdlib.h>
-#include <ac/ctype.h>
-#include <ac/socket.h>
-#include <ac/string.h>
-
-#include "slapcommon.h"
-
-int
-main( int argc, char **argv )
-{
-       ID id;
-       int rc = EXIT_SUCCESS;
-       Operation op = {0};
-
-       slap_tool_init( "slapcat", SLAPCAT, argc, argv );
-
-       if( !be->be_entry_open ||
-               !be->be_entry_close ||
-               !be->be_entry_first ||
-               !be->be_entry_next ||
-               !be->be_entry_get )
-       {
-               fprintf( stderr, "%s: database doesn't support necessary operations.\n",
-                       progname );
-               exit( EXIT_FAILURE );
-       }
-
-       if( be->be_entry_open( be, 0 ) != 0 ) {
-               fprintf( stderr, "%s: could not open database.\n",
-                       progname );
-               exit( EXIT_FAILURE );
-       }
-
-       for ( id = be->be_entry_first( be );
-               id != NOID;
-               id = be->be_entry_next( be ) )
-       {
-               char *data;
-               int len;
-               Entry* e = be->be_entry_get( be, id );
-               op.o_bd = be;
-
-               if ( e == NULL ) {
-                       printf("# no data for entry id=%08lx\n\n", (long) id );
-                       rc = EXIT_FAILURE;
-                       if( continuemode ) continue;
-                       break;
-               }
-
-               if( sub_ndn.bv_len && !dnIsSuffix( &e->e_nname, &sub_ndn ) ) {
-                       be_entry_release_r( &op, e );
-                       continue;
-               }
-
-               if ( retrieve_ctxcsn == 0 ) {
-                       if ( is_entry_syncProviderSubentry( e ) ) {
-                               be_entry_release_r( &op, e );
-                               continue;
-                       }
-               }
-
-               if ( retrieve_synccookie == 0 ) {
-                       if ( is_entry_syncConsumerSubentry( e ) ) {
-                               be_entry_release_r( &op, e );
-                               continue;
-                       }
-               }
-
-               if( verbose ) {
-                       printf( "# id=%08lx\n", (long) id );
-               }
-
-               data = entry2str( e, &len );
-               be_entry_release_r( &op, e );
-
-               if ( data == NULL ) {
-                       printf("# bad data for entry id=%08lx\n\n", (long) id );
-                       rc = EXIT_FAILURE;
-                       if( continuemode ) continue;
-                       break;
-               }
-
-               fputs( data, ldiffp );
-               fputs( "\n", ldiffp );
-       }
-
-       be->be_entry_close( be );
-
-       slap_tool_destroy();
-       return rc;
-}
diff --git a/servers/slapd/tools/slapcat.dsp b/servers/slapd/tools/slapcat.dsp
deleted file mode 100644 (file)
index 8aa4dc9..0000000
+++ /dev/null
@@ -1,156 +0,0 @@
-# Microsoft Developer Studio Project File - Name="slapcat" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 5.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=slapcat - Win32 Single Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "slapcat.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "slapcat.mak" CFG="slapcat - Win32 Single Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "slapcat - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "slapcat - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "slapcat - Win32 Single Debug" (based on\
- "Win32 (x86) Console Application")
-!MESSAGE "slapcat - Win32 Single Release" (based on\
- "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "slapcat - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\..\Release"
-# PROP Intermediate_Dir "..\..\..\Release\slapcat"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\..\..\include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 sasl.lib libdb40.lib rpcrt4.lib hs_regex.lib libsasl.lib ws2_32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\Release"
-
-!ELSEIF  "$(CFG)" == "slapcat - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "slapcat"
-# PROP BASE Intermediate_Dir "slapcat"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\..\Debug"
-# PROP Intermediate_Dir "..\..\..\Debug\slapcat"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\..\..\include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 libdb40d.lib rpcrt4.lib hs_regex.lib libsasl.lib ws2_32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\Debug"
-
-!ELSEIF  "$(CFG)" == "slapcat - Win32 Single Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "slapcat"
-# PROP BASE Intermediate_Dir "slapcat"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\..\Sdebug"
-# PROP Intermediate_Dir "..\..\..\SDebug\slapcat"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\..\..\include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /Gm /GX /Zi /Od /I "..\..\..\include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 oldbm32.lib libdb.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\libraries\Debug"
-# ADD LINK32 libdb32.lib rpcrt4.lib hs_regex.lib libsasl.lib ws2_32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\SDebug"
-
-!ELSEIF  "$(CFG)" == "slapcat - Win32 Single Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "slapcat"
-# PROP BASE Intermediate_Dir "slapcat"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\..\SRelease"
-# PROP Intermediate_Dir "..\..\..\SRelease\slapcat"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "..\..\..\include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib libdb.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\libraries\Release"
-# ADD LINK32 libdbs.lib libdb32.lib hs_regex.lib libsasl.lib ws2_32.lib rpcrt4.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\SRelease"
-
-!ENDIF 
-
-# Begin Target
-
-# Name "slapcat - Win32 Release"
-# Name "slapcat - Win32 Debug"
-# Name "slapcat - Win32 Single Debug"
-# Name "slapcat - Win32 Single Release"
-# Begin Source File
-
-SOURCE=.\mimic.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\slapcat.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\slapcommon.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\slapcommon.h
-# End Source File
-# End Target
-# End Project
diff --git a/servers/slapd/tools/slapcommon.c b/servers/slapd/tools/slapcommon.c
deleted file mode 100644 (file)
index 4d2117b..0000000
+++ /dev/null
@@ -1,441 +0,0 @@
-/* slapcommon.c - common routine for the slap tools */
-/* $OpenLDAP$ */
-/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
- *
- * Copyright 1998-2004 The OpenLDAP Foundation.
- * Portions Copyright 1998-2003 Kurt D. Zeilenga.
- * Portions Copyright 2003 IBM Corporation.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
- *
- * A copy of this license is available in file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
- */
-/* ACKNOWLEDGEMENTS:
- * This work was initially developed by Kurt Zeilenga for inclusion
- * in OpenLDAP Software.  Additional signficant contributors include
- *    Jong Hyuk Choi
- *    Hallvard B. Furuseth
- *    Howard Chu
- *    Pierangelo Masarati
- */
-
-#include "portable.h"
-
-#include <stdio.h>
-
-#include <ac/stdlib.h>
-#include <ac/ctype.h>
-#include <ac/string.h>
-#include <ac/socket.h>
-#include <ac/unistd.h>
-
-#include "slapcommon.h"
-#include "lutil.h"
-
-
-char   *progname       = NULL;
-char   *conffile       = SLAPD_DEFAULT_CONFIGFILE;
-int            truncatemode = 0;
-int            verbose         = 0;
-int            update_ctxcsn = SLAP_TOOL_CTXCSN_KEEP;
-int            retrieve_ctxcsn = 0;
-int            retrieve_synccookie = 0;
-int            replica_promotion = 0;
-int            replica_demotion = 0;
-char   *replica_id_string = NULL;
-char   **replica_id_strlist = NULL;
-int            *replica_id_list = NULL;
-int            continuemode = 0;
-int            nosubordinates = 0;
-int            dryrun = 0;
-struct berval  sub_ndn = { 0, NULL };
-
-char   *ldiffile       = NULL;
-FILE   *ldiffp         = NULL;
-
-#ifdef CSRIMALLOC
-       char *leakfilename;
-       FILE *leakfile;
-#endif
-
-Backend *be = NULL;
-
-static void
-usage( int tool )
-{
-       char *options = NULL;
-       fprintf( stderr,
-               "usage: %s [-v] [-c] [-d debuglevel] [-f configfile]\n"
-                       "\t[-n databasenumber | -b suffix]", progname );
-
-       switch( tool ) {
-       case SLAPADD:
-               options = "\n\t[-l ldiffile] [-u] [-p [-w] | -r [-i syncreplidlist] [-w]]\n";
-               break;
-
-       case SLAPCAT:
-               options = "\t[-l ldiffile] [-m] [-k]\n";
-               break;
-
-       case SLAPINDEX:
-               options = "\n";
-               break;
-       }
-
-       if( options != NULL ) {
-               fputs( options, stderr );
-       }
-       exit( EXIT_FAILURE );
-}
-
-
-/*
- * slap_tool_init - initialize slap utility, handle program options.
- * arguments:
- *     name            program name
- *     tool            tool code
- *     argc, argv      command line arguments
- */
-
-void
-slap_tool_init(
-       const char* name,
-       int tool,
-       int argc, char **argv )
-{
-       char *options;
-       struct berval base = { 0, NULL };
-       char *subtree = NULL;
-       int rc, i, dbnum;
-       int mode = SLAP_TOOL_MODE;
-
-       progname = lutil_progname( name, argc, argv );
-
-#ifdef CSRIMALLOC
-       leakfilename = malloc( strlen( progname ) + sizeof(".leak") );
-       sprintf( leakfilename, "%s.leak", progname );
-       if( ( leakfile = fopen( leakfilename, "w" )) == NULL ) {
-               leakfile = stderr;
-       }
-       free( leakfilename );
-#endif
-
-       switch( tool ) {
-       case SLAPADD:
-               options = "b:cd:f:i:l:n:prtuvWw";
-               break;
-
-       case SLAPINDEX:
-               options = "b:cd:f:n:v";
-               mode |= SLAP_TOOL_READMAIN;
-               break;
-
-       case SLAPCAT:
-               options = "b:cd:f:kl:mn:s:v";
-               mode |= SLAP_TOOL_READMAIN | SLAP_TOOL_READONLY;
-               break;
-
-       default:
-               fprintf( stderr, "%s: unknown tool mode (%d)\n",
-                        progname, tool );
-               exit( EXIT_FAILURE );
-       }
-
-       ldiffile = NULL;
-       conffile = SLAPD_DEFAULT_CONFIGFILE;
-       dbnum = -1;
-       while ( (i = getopt( argc, argv, options )) != EOF ) {
-               switch ( i ) {
-               case 'b':
-                       base.bv_val = strdup( optarg );
-                       base.bv_len = strlen( base.bv_val );
-                       break;
-
-               case 'c':       /* enable continue mode */
-                       continuemode++;
-                       break;
-
-               case 'd':       /* turn on debugging */
-                       ldap_debug += atoi( optarg );
-                       break;
-
-               case 'f':       /* specify a conf file */
-                       conffile = strdup( optarg );
-                       break;
-
-               case 'i': /* specify syncrepl id list */
-                       replica_id_string = strdup( optarg );
-                       if ( !isdigit( (unsigned char) *replica_id_string )) {
-                               usage( tool );
-                               exit( EXIT_FAILURE );
-                       }
-                       str2clist( &replica_id_strlist, replica_id_string, "," );
-                       for ( i = 0; replica_id_strlist && replica_id_strlist[i]; i++ ) ;
-                       replica_id_list = ch_calloc( i + 1, sizeof( int ) );
-                       for ( i = 0; replica_id_strlist && replica_id_strlist[i]; i++ ) {
-                               replica_id_list[i] = atoi( replica_id_strlist[i] );
-                               if ( replica_id_list[i] >= 1000 ) {
-                                       fprintf(stderr,
-                                               "%s: syncrepl id %d is out of range [0..999]\n",
-                                               progname, replica_id_list[i] );
-                                       exit( EXIT_FAILURE );
-                               }
-                       }
-                       replica_id_list[i] = -1;
-                       break;
-
-               case 'k':       /* Retrieve sync cookie entry */
-                       retrieve_synccookie = 1;
-                       break;
-
-               case 'l':       /* LDIF file */
-                       ldiffile = strdup( optarg );
-                       break;
-
-               case 'm':       /* Retrieve ldapsync entry */
-                       retrieve_ctxcsn = 1;
-                       break;
-
-               case 'n':       /* which config file db to index */
-                       dbnum = atoi( optarg ) - 1;
-                       break;
-
-               case 'p':       /* replica promotion */
-                       replica_promotion = 1;          
-                       break;
-
-               case 'r':       /* replica demotion */
-                       replica_demotion = 1;           
-                       break;
-
-               case 's':       /* dump subtree */
-                       subtree = strdup( optarg );
-                       break;
-
-               case 't':       /* turn on truncate */
-                       truncatemode++;
-                       mode |= SLAP_TRUNCATE_MODE;
-                       break;
-
-               case 'u':       /* dry run */
-                       dryrun++;
-                       break;
-
-               case 'v':       /* turn on verbose */
-                       verbose++;
-                       break;
-
-               case 'W':       /* write context csn on every entry add */
-                       update_ctxcsn = SLAP_TOOL_CTXCSN_BATCH;
-                       /* FIXME : update_ctxcsn = SLAP_TOOL_CTXCSN_ENTRY; */
-                       break;
-
-               case 'w':       /* write context csn on at the end */
-                       update_ctxcsn = SLAP_TOOL_CTXCSN_BATCH;
-                       break;
-
-               default:
-                       usage( tool );
-                       break;
-               }
-       }
-
-       if ( ( argc != optind ) || (dbnum >= 0 && base.bv_val != NULL ) ) {
-               usage( tool );
-       }
-
-       if ( replica_promotion && replica_demotion ) {
-               usage( tool );
-       } else if ( !replica_promotion && !replica_demotion ) {
-               if ( update_ctxcsn != SLAP_TOOL_CTXCSN_KEEP ) {
-                       usage( tool );
-               }
-       }
-
-       if ( ldiffile == NULL ) {
-               ldiffp = tool == SLAPCAT ? stdout : stdin;
-
-       } else if( (ldiffp = fopen( ldiffile, tool == SLAPCAT ? "w" : "r" ))
-               == NULL )
-       {
-               perror( ldiffile );
-               exit( EXIT_FAILURE );
-       }
-
-       /*
-        * initialize stuff and figure out which backend we're dealing with
-        */
-
-#ifdef SLAPD_MODULES
-       if ( module_init() != 0 ) {
-               fprintf( stderr, "%s: module_init failed!\n", progname );
-               exit( EXIT_FAILURE );
-       }
-#endif
-               
-       rc = slap_init( mode, progname );
-
-       if ( rc != 0 ) {
-               fprintf( stderr, "%s: slap_init failed!\n", progname );
-               exit( EXIT_FAILURE );
-       }
-
-       rc = slap_schema_init();
-
-       if ( rc != 0 ) {
-               fprintf( stderr, "%s: slap_schema_init failed!\n", progname );
-               exit( EXIT_FAILURE );
-       }
-
-       rc = read_config( conffile, 0 );
-
-       if ( rc != 0 ) {
-               fprintf( stderr, "%s: bad configuration file!\n", progname );
-               exit( EXIT_FAILURE );
-       }
-
-       if ( !nbackends ) {
-               fprintf( stderr, "No databases found in config file\n" );
-               exit( EXIT_FAILURE );
-       }
-
-       rc = glue_sub_init();
-
-       if ( rc != 0 ) {
-               fprintf( stderr, "Subordinate configuration error\n" );
-               exit( EXIT_FAILURE );
-       }
-
-       rc = slap_schema_check();
-
-       if ( rc != 0 ) {
-               fprintf( stderr, "%s: slap_schema_prep failed!\n", progname );
-               exit( EXIT_FAILURE );
-       }
-
-       if( subtree ) {
-               struct berval val;
-               val.bv_val = subtree;
-               val.bv_len = strlen( subtree );
-               rc = dnNormalize( 0, NULL, NULL, &val, &sub_ndn, NULL );
-               if( rc != LDAP_SUCCESS ) {
-                       fprintf( stderr, "Invalid subtree DN '%s'\n", optarg );
-                       exit( EXIT_FAILURE );
-               }
-
-               if( base.bv_val == NULL && dbnum == -1 )
-                       base = val;
-               else
-                       free( subtree );
-       }
-
-       if( base.bv_val != NULL ) {
-               struct berval nbase;
-
-               rc = dnNormalize( 0, NULL, NULL, &base, &nbase, NULL );
-               if( rc != LDAP_SUCCESS ) {
-                       fprintf( stderr, "%s: slap_init invalid suffix (\"%s\")\n",
-                               progname, base.bv_val );
-                       exit( EXIT_FAILURE );
-               }
-
-               be = select_backend( &nbase, 0, 0 );
-               ber_memfree( nbase.bv_val );
-
-               if( be == NULL ) {
-                       fprintf( stderr, "%s: slap_init no backend for \"%s\"\n",
-                               progname, base.bv_val );
-                       exit( EXIT_FAILURE );
-               }
-               /* If the named base is a glue master, operate on the
-                * entire context
-                */
-               if (SLAP_GLUE_INSTANCE(be)) {
-                       nosubordinates = 1;
-               }
-
-       } else if ( dbnum == -1 ) {
-               if ( nbackends <= 0 ) {
-                       fprintf( stderr, "No available databases\n" );
-                       exit( EXIT_FAILURE );
-               }
-               
-               be = &backends[dbnum=0];
-               /* If just doing the first by default and it is a
-                * glue subordinate, find the master.
-                */
-               while (SLAP_GLUE_SUBORDINATE(be) || SLAP_MONITOR(be)) {
-                       if (SLAP_GLUE_SUBORDINATE(be)) {
-                               nosubordinates = 1;
-                       }
-                       be++;
-                       dbnum++;
-               }
-
-
-               if ( dbnum >= nbackends ) {
-                       fprintf( stderr, "Available database(s) "
-                                       "do not allow %s\n", name );
-                       exit( EXIT_FAILURE );
-               }
-               
-               if ( nosubordinates == 0 && dbnum > 0 ) {
-#ifdef NEW_LOGGING
-                       LDAP_LOG( BACKEND, ERR, 
-"The first database does not allow %s; using the first available one (%d)\n",
-                               name, dbnum + 1, 0 );
-#else
-                       Debug( LDAP_DEBUG_ANY,
-"The first database does not allow %s; using the first available one (%d)\n",
-                               name, dbnum + 1, 0 );
-#endif
-               }
-
-       } else if ( dbnum < 0 || dbnum > (nbackends-1) ) {
-               fprintf( stderr,
-                       "Database number selected via -n is out of range\n"
-                       "Must be in the range 1 to %d"
-                               " (number of databases in the config file)\n",
-                       nbackends );
-               exit( EXIT_FAILURE );
-
-       } else {
-               be = &backends[dbnum];
-       }
-
-#ifdef CSRIMALLOC
-       mal_leaktrace(1);
-#endif
-
-       if ( slap_startup( be ) ) {
-               fprintf( stderr, "slap_startup failed\n" );
-               exit( EXIT_FAILURE );
-       }
-}
-
-void slap_tool_destroy( void )
-{
-       slap_shutdown( be );
-       slap_destroy();
-#ifdef SLAPD_MODULES
-       if ( slapMode == SLAP_SERVER_MODE ) {
-       /* always false. just pulls in necessary symbol references. */
-               lutil_uuidstr(NULL, 0);
-       }
-       module_kill();
-#endif
-       schema_destroy();
-#ifdef HAVE_TLS
-       ldap_pvt_tls_destroy();
-#endif
-       config_destroy();
-
-#ifdef CSRIMALLOC
-       mal_dumpleaktrace( leakfile );
-#endif
-}
diff --git a/servers/slapd/tools/slapcommon.h b/servers/slapd/tools/slapcommon.h
deleted file mode 100644 (file)
index 396a71a..0000000
+++ /dev/null
@@ -1,62 +0,0 @@
-/* slapcommon.h - common definitions for the slap tools */
-/* $OpenLDAP$ */
-/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
- *
- * Copyright 1998-2004 The OpenLDAP Foundation.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
- *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
- */
-
-#ifndef SLAPCOMMON_H_
-#define SLAPCOMMON_H_ 1
-
-#define SLAPD_TOOLS 1
-#include "../slap.h"
-
-enum slaptool {
-       SLAPCAT=1,      /* database -> LDIF tool */
-       SLAPADD,        /* LDIF -> database tool */
-       SLAPINDEX,      /* database index tool */
-       SLAPTEST        /* database testing tool */
-};
-
-#define SLAP_TOOL_CTXCSN_KEEP  0
-#define SLAP_TOOL_CTXCSN_ENTRY 1
-#define SLAP_TOOL_CTXCSN_BATCH 2
-
-extern char    *progname;
-extern char    *conffile;
-extern Backend *be;
-extern int             appendmode;
-extern int             verbose;
-extern int             update_ctxcsn;
-extern int             retrieve_ctxcsn;
-extern int             retrieve_synccookie;
-extern int             replica_promotion;
-extern int             replica_demotion;
-extern char    *replica_id_string;
-extern char    **replica_id_strlist;
-extern int     *replica_id_list;
-extern int             continuemode;
-extern int             nosubordinates;
-extern int             dryrun;
-extern struct berval   sub_ndn;
-
-extern char    *ldiffile;
-extern FILE    *ldiffp;
-
-void slap_tool_init LDAP_P((
-       const char* name,
-       int tool,
-       int argc, char **argv ));
-
-void slap_tool_destroy LDAP_P((void));
-
-#endif /* SLAPCOMMON_H_ */
diff --git a/servers/slapd/tools/slapindex.c b/servers/slapd/tools/slapindex.c
deleted file mode 100644 (file)
index 08fd49c..0000000
+++ /dev/null
@@ -1,82 +0,0 @@
-/* $OpenLDAP$ */
-/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
- *
- * Copyright 1998-2004 The OpenLDAP Foundation.
- * Portions Copyright 1998-2003 Kurt D. Zeilenga.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
- *
- * A copy of this license is available in file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
- */
-/* ACKNOWLEDGEMENTS:
- * This work was initially developed by Kurt Zeilenga for inclusion
- * in OpenLDAP Software.
- */
-
-#include "portable.h"
-
-#include <stdio.h>
-
-#include <ac/stdlib.h>
-
-#include <ac/ctype.h>
-#include <ac/string.h>
-#include <ac/socket.h>
-#include <ac/unistd.h>
-
-#include "slapcommon.h"
-
-int
-main( int argc, char **argv )
-{
-       ID id;
-       int rc = EXIT_SUCCESS;
-
-       slap_tool_init( "slapindex", SLAPINDEX, argc, argv );
-
-       if( !be->be_entry_open ||
-               !be->be_entry_close ||
-               !be->be_entry_first ||
-               !be->be_entry_next  ||
-               !be->be_entry_reindex )
-       {
-               fprintf( stderr, "%s: database doesn't support necessary operations.\n",
-                       progname );
-               exit( EXIT_FAILURE );
-       }
-
-       if( be->be_entry_open( be, 0 ) != 0 ) {
-               fprintf( stderr, "%s: could not open database.\n",
-                       progname );
-               exit( EXIT_FAILURE );
-       }
-
-       for ( id = be->be_entry_first( be );
-               id != NOID;
-               id = be->be_entry_next( be ) )
-       {
-               int rtn;
-
-               if( verbose ) {
-                       printf("indexing id=%08lx\n", (long) id );
-               }
-
-               rtn =  be->be_entry_reindex( be, id );
-
-               if( rtn != LDAP_SUCCESS ) {
-                       rc = EXIT_FAILURE;
-                       if( continuemode ) continue;
-                       break;
-               }
-       }
-
-       (void) be->be_entry_close( be );
-
-       slap_tool_destroy();
-       return( rc );
-}
diff --git a/servers/slapd/tools/slapindex.dsp b/servers/slapd/tools/slapindex.dsp
deleted file mode 100644 (file)
index 1a836ac..0000000
+++ /dev/null
@@ -1,158 +0,0 @@
-# Microsoft Developer Studio Project File - Name="slapindex" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 5.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=slapindex - Win32 Single Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "slapindex.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "slapindex.mak" CFG="slapindex - Win32 Single Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "slapindex - Win32 Release" (based on\
- "Win32 (x86) Console Application")
-!MESSAGE "slapindex - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "slapindex - Win32 Single Debug" (based on\
- "Win32 (x86) Console Application")
-!MESSAGE "slapindex - Win32 Single Release" (based on\
- "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "slapindex - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\..\Release"
-# PROP Intermediate_Dir "..\..\..\Release\slapindex"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\..\..\include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 sasl.lib libdb40.lib rpcrt4.lib hs_regex.lib libsasl.lib ws2_32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\Release"
-
-!ELSEIF  "$(CFG)" == "slapindex - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "ldif2ind"
-# PROP BASE Intermediate_Dir "ldif2ind"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\..\Debug"
-# PROP Intermediate_Dir "..\..\..\Debug\slapindex"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\..\..\include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 libdb40d.lib rpcrt4.lib hs_regex.lib libsasl.lib ws2_32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\Debug"
-
-!ELSEIF  "$(CFG)" == "slapindex - Win32 Single Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "ldif2ind"
-# PROP BASE Intermediate_Dir "ldif2ind"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\..\SDebug"
-# PROP Intermediate_Dir "..\..\..\SDebug\slapindex"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\..\..\include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /Gm /GX /Zi /Od /I "..\..\..\include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib shell32.lib hs_regexd.lib libdbs.lib ws2_32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 libdb32.lib rpcrt4.lib hs_regex.lib libsasl.lib ws2_32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\SDebug"
-
-!ELSEIF  "$(CFG)" == "slapindex - Win32 Single Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "ldif2in0"
-# PROP BASE Intermediate_Dir "ldif2in0"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\..\SRelease"
-# PROP Intermediate_Dir "..\..\..\SRelease\slapindex"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MT /W3 /GX /O2 /I "..\..\..\include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "..\..\..\include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 hs_regex.lib libdb.lib ws2_32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 libdbs.lib libdb32.lib hs_regex.lib libsasl.lib ws2_32.lib rpcrt4.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\SRelease"
-
-!ENDIF 
-
-# Begin Target
-
-# Name "slapindex - Win32 Release"
-# Name "slapindex - Win32 Debug"
-# Name "slapindex - Win32 Single Debug"
-# Name "slapindex - Win32 Single Release"
-# Begin Source File
-
-SOURCE=.\mimic.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\slapcommon.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\slapcommon.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\slapindex.c
-# End Source File
-# End Target
-# End Project
diff --git a/servers/slapd/tools/slappasswd.c b/servers/slapd/tools/slappasswd.c
deleted file mode 100644 (file)
index b144ae5..0000000
+++ /dev/null
@@ -1,149 +0,0 @@
-/* $OpenLDAP$ */
-/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
- *
- * Copyright 1998-2004 The OpenLDAP Foundation.
- * Portions Copyright 1998-2003 Kurt D. Zeilenga.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
- *
- * A copy of this license is available in file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
- */
-/* ACKNOWLEDGEMENTS:
- * This work was initially developed by Kurt Zeilenga for inclusion
- * in OpenLDAP Software.
- */
-
-#include "portable.h"
-
-#include <stdio.h>
-
-#include <ac/stdlib.h>
-
-#include <ac/ctype.h>
-#include <ac/signal.h>
-#include <ac/socket.h>
-#include <ac/string.h>
-#include <ac/time.h>
-#include <ac/unistd.h>
-
-#include <ldap.h>
-#include <lutil.h>
-
-#include "ldap_defaults.h"
-
-static int     verbose = 0;
-
-static void
-usage(const char *s)
-{
-       fprintf(stderr,
-               "Usage: %s [options]\n"
-               "  -h hash\tpassword scheme\n"
-               "  -s secret\tnew password\n"
-               "  -c format\tcrypt(3) salt format\n"
-               "  -u\t\tgenerate RFC2307 values (default)\n"
-               "  -v\t\tincrease verbosity\n"
-               "  -T file\tread file for new password\n"
-               , s );
-
-       exit( EXIT_FAILURE );
-}
-
-int
-main( int argc, char *argv[] )
-{
-       char    *scheme = "{SSHA}";
-       char    *newpw = NULL;
-       char    *pwfile = NULL;
-       const char *text;
-
-       int             i;
-       struct berval passwd;
-       struct berval *hash = NULL;
-
-       while( (i = getopt( argc, argv,
-               "c:d:h:s:T:vu" )) != EOF )
-       {
-               switch (i) {
-               case 'c':       /* crypt salt format */
-                       scheme = "{CRYPT}";
-                       lutil_salt_format( optarg );
-                       break;
-
-               case 'h':       /* scheme */
-                       scheme = strdup( optarg );
-                       break;
-
-               case 's':       /* new password (secret) */
-                       {
-                               char* p;
-                               newpw = strdup( optarg );
-
-                               for( p = optarg; *p != '\0'; p++ ) {
-                                       *p = '\0';
-                               }
-                       } break;
-
-               case 'T':       /* password file */
-                       pwfile = optarg;
-                       break;
-
-               case 'u':       /* RFC2307 userPassword */
-                       break;
-
-               case 'v':       /* verbose */
-                       verbose++;
-                       break;
-
-               default:
-                       usage (argv[0]);
-               }
-       }
-
-       if( argc - optind != 0 ) {
-               usage( argv[0] );
-       } 
-
-       if( pwfile != NULL ) {
-               if( lutil_get_filed_password( pwfile, &passwd )) {
-                       return EXIT_FAILURE;
-               }
-       } else {
-               if( newpw == NULL ) {
-                       /* prompt for new password */
-                       char *cknewpw;
-                       newpw = strdup(getpassphrase("New password: "));
-                       cknewpw = getpassphrase("Re-enter new password: ");
-       
-                       if( strcmp( newpw, cknewpw )) {
-                               fprintf( stderr, "Password values do not match\n" );
-                               return EXIT_FAILURE;
-                       }
-               }
-
-               passwd.bv_val = newpw;
-               passwd.bv_len = strlen(passwd.bv_val);
-       }
-
-       hash = lutil_passwd_hash( &passwd, scheme, &text );
-       if( hash == NULL || hash->bv_val == NULL ) {
-               fprintf( stderr,
-                       "Password generation failed for scheme %s: %s\n",
-                       scheme, text ? text : "" );
-               return EXIT_FAILURE;
-       }
-
-       if( lutil_passwd( hash, &passwd, NULL, &text ) ) {
-               fprintf( stderr, "Password verification failed. %s\n",
-                       text ? text : "" );
-               return EXIT_FAILURE;
-       }
-
-       printf( "%s\n" , hash->bv_val );
-       return EXIT_SUCCESS;
-}