/* $OpenLDAP$ */
/*
- * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved.
* COPYING RESTRICTIONS APPLY, see COPYRIGHT file
*/
#include "portable.h"
#define SEARCHCMD "slapd-search"
#define READCMD "slapd-read"
#define ADDCMD "slapd-addel"
+#define MODRDNCMD "slapd-modrdn"
#define MAXARGS 100
#define MAXREQS 20
#define LOOPS "100"
#define TSEARCHFILE "do_search.0"
#define TREADFILE "do_read.0"
#define TADDFILE "do_add."
+#define TMODRDNFILE "do_modrdn.0"
static char *get_file_name( char *dirname, char *filename );
static int get_search_filters( char *filename, char *filters[] );
static int get_read_entries( char *filename, char *entries[] );
-static void fork_child( char *prog, char *args[] );
+static void fork_child( char *prog, char **args );
static void wait4kids( int nkidval );
static int maxkids = 20;
main( int argc, char **argv )
{
int i, j;
+ char *uri = NULL;
char *host = "localhost";
char *port = NULL;
char *manager = NULL;
int rnum = 0;
char *afiles[MAXREQS];
int anum = 0;
+ char *mfile = NULL;
+ char *mreqs[MAXREQS];
+ int mnum = 0;
char *sargs[MAXARGS];
int sanum;
char scmd[MAXPATHLEN];
char *aargs[MAXARGS];
int aanum;
char acmd[MAXPATHLEN];
+ char *margs[MAXARGS];
+ int manum;
+ char mcmd[MAXPATHLEN];
- while ( (i = getopt( argc, argv, "h:p:D:w:b:d:j:l:P:" )) != EOF ) {
+ while ( (i = getopt( argc, argv, "H:h:p:D:w:b:d:j:l:P:" )) != EOF ) {
switch( i ) {
+ case 'H': /* slapd uri */
+ uri = strdup( optarg );
+ break;
+
case 'h': /* slapd host */
host = strdup( optarg );
break;
}
}
- if (( dirname == NULL ) || ( sbase == NULL ) || ( port == NULL ) ||
+ if (( dirname == NULL ) || ( sbase == NULL ) || ( port == NULL && uri == NULL ) ||
( manager == NULL ) || ( passwd == NULL ) || ( progdir == NULL ))
usage( argv[0] );
}
- /* look for search, read, and add/delete files */
+ /* look for search, read, modrdn, and add/delete files */
for ( file = readdir( datadir ); file; file = readdir( datadir )) {
if ( !strcasecmp( file->d_name, TSEARCHFILE )) {
} else if ( !strcasecmp( file->d_name, TREADFILE )) {
rfile = get_file_name( dirname, file->d_name );
continue;
+ } else if ( !strcasecmp( file->d_name, TMODRDNFILE )) {
+ mfile = get_file_name( dirname, file->d_name );
+ continue;
} else if ( !strncasecmp( file->d_name, TADDFILE, strlen( TADDFILE ))
&& ( anum < MAXREQS )) {
afiles[anum++] = get_file_name( dirname, file->d_name );
rnum = get_read_entries( rfile, rreqs );
}
+ /* look for modrdn requests */
+ if ( mfile ) {
+ mnum = get_read_entries( mfile, mreqs );
+ }
+
/*
* generate the search clients
*/
sanum = 0;
- sprintf( scmd, "%s%s%s", progdir, LDAP_DIRSEP, SEARCHCMD );
+ snprintf( scmd, sizeof scmd, "%s" LDAP_DIRSEP SEARCHCMD,
+ progdir );
sargs[sanum++] = scmd;
- sargs[sanum++] = "-h";
- sargs[sanum++] = host;
- sargs[sanum++] = "-p";
- sargs[sanum++] = port;
+ if ( uri ) {
+ sargs[sanum++] = "-H";
+ sargs[sanum++] = uri;
+ } else {
+ sargs[sanum++] = "-h";
+ sargs[sanum++] = host;
+ sargs[sanum++] = "-p";
+ sargs[sanum++] = port;
+ }
sargs[sanum++] = "-b";
sargs[sanum++] = sbase;
sargs[sanum++] = "-l";
*/
ranum = 0;
- sprintf( rcmd, "%s%s%s", progdir, LDAP_DIRSEP, READCMD );
+ snprintf( rcmd, sizeof rcmd, "%s" LDAP_DIRSEP READCMD,
+ progdir );
rargs[ranum++] = rcmd;
- rargs[ranum++] = "-h";
- rargs[ranum++] = host;
- rargs[ranum++] = "-p";
- rargs[ranum++] = port;
+ if ( uri ) {
+ rargs[ranum++] = "-H";
+ rargs[ranum++] = uri;
+ } else {
+ rargs[ranum++] = "-h";
+ rargs[ranum++] = host;
+ rargs[ranum++] = "-p";
+ rargs[ranum++] = port;
+ }
rargs[ranum++] = "-l";
rargs[ranum++] = loops;
rargs[ranum++] = "-e";
rargs[ranum++] = NULL; /* will hold the read entry */
rargs[ranum++] = NULL;
+ /*
+ * generate the modrdn clients
+ */
+
+ manum = 0;
+ snprintf( mcmd, sizeof mcmd, "%s" LDAP_DIRSEP MODRDNCMD,
+ progdir );
+ margs[manum++] = mcmd;
+ if ( uri ) {
+ margs[manum++] = "-H";
+ margs[manum++] = uri;
+ } else {
+ margs[manum++] = "-h";
+ margs[manum++] = host;
+ margs[manum++] = "-p";
+ margs[manum++] = port;
+ }
+ margs[manum++] = "-D";
+ margs[manum++] = manager;
+ margs[manum++] = "-w";
+ margs[manum++] = passwd;
+ margs[manum++] = "-l";
+ margs[manum++] = loops;
+ margs[manum++] = "-e";
+ margs[manum++] = NULL; /* will hold the modrdn entry */
+ margs[manum++] = NULL;
+
/*
* generate the add/delete clients
*/
aanum = 0;
- sprintf( acmd, "%s%s%s", progdir, LDAP_DIRSEP, ADDCMD );
+ snprintf( acmd, sizeof acmd, "%s" LDAP_DIRSEP ADDCMD,
+ progdir );
aargs[aanum++] = acmd;
- aargs[aanum++] = "-h";
- aargs[aanum++] = host;
- aargs[aanum++] = "-p";
- aargs[aanum++] = port;
+ if ( uri ) {
+ aargs[aanum++] = "-H";
+ aargs[aanum++] = uri;
+ } else {
+ aargs[aanum++] = "-h";
+ aargs[aanum++] = host;
+ aargs[aanum++] = "-p";
+ aargs[aanum++] = port;
+ }
aargs[aanum++] = "-D";
aargs[aanum++] = manager;
aargs[aanum++] = "-w";
}
+ if ( j < mnum ) {
+
+ margs[manum - 2] = mreqs[j];
+ fork_child( mcmd, margs );
+
+ }
+
if ( j < anum ) {
aargs[aanum - 2] = afiles[j];
{
char buf[MAXPATHLEN];
- sprintf( buf, "%s%s%s", dirname, LDAP_DIRSEP, filename );
+ snprintf( buf, sizeof buf, "%s" LDAP_DIRSEP "%s",
+ dirname, filename );
return( strdup( buf ));
}
#ifndef HAVE_WINSOCK
static void
-fork_child( char *prog, char *args[] )
+fork_child( char *prog, char **args )
{
pid_t pid;
switch ( pid = fork() ) {
case 0: /* child */
+#ifdef HAVE_EBCDIC
+ /* The __LIBASCII execvp only handles ASCII "prog",
+ * we still need to translate the arg vec ourselves.
+ */
+ { char *arg2[MAXREQS];
+ int i;
+
+ for (i=0; args[i]; i++) {
+ arg2[i] = ArgDup(args[i]);
+ __atoe(arg2[i]);
+ }
+ arg2[i] = NULL;
+ args = arg2; }
+#endif
execvp( prog, args );
fprintf( stderr, "%s: ", prog );
perror( "execv" );
}
static void
-fork_child( char *prog, char *args[] )
+fork_child( char *prog, char **args )
{
int rc;
projects / openldap / blobdiff