+/* $OpenLDAP$ */
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 1999-2005 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 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 Spanier for inclusion
+ * in OpenLDAP Software.
+ */
+
#include "portable.h"
#include <stdio.h>
#include <ac/stdlib.h>
#include <ac/ctype.h>
+#include <ac/param.h>
#include <ac/socket.h>
#include <ac/string.h>
#include <ac/unistd.h>
#include <ac/wait.h>
-#ifdef HAVE_SYS_PARAM_H
-#include <sys/param.h>
-#endif
-
+#define LDAP_DEPRECATED 1
#include <ldap.h>
#define LOOPS 100
+#define RETRIES 0
static char *
get_add_entry( char *filename, LDAPMod ***mods );
static void
-do_addel( char *host, int port, char *manager, char *passwd,
- char *dn, LDAPMod **attrs, int maxloop );
+do_addel( char *uri, char *host, int port, char *manager, char *passwd,
+ char *dn, LDAPMod **attrs, int maxloop, int maxretries );
static void
usage( char *name )
main( int argc, char **argv )
{
int i;
- char *host = "localhost";
- int port = -1;
+ char *host = "localhost";
+ char *uri = NULL;
+ int port = -1;
char *manager = NULL;
char *passwd = NULL;
char *filename = NULL;
char *entry = NULL;
- int loops = LOOPS;
- LDAPMod **attrs = NULL;
+ int loops = LOOPS;
+ int retries = RETRIES;
+ LDAPMod **attrs = NULL;
- while ( (i = getopt( argc, argv, "h:p:D:w:f:l:" )) != EOF ) {
+ while ( (i = getopt( argc, argv, "H:h:p:D:w:f:l:r:" )) != EOF ) {
switch( i ) {
- case 'h': /* the servers host */
- host = strdup( optarg );
+ case 'H': /* the server's URI */
+ uri = strdup( optarg );
break;
- case 'p': /* the servers port */
- port = atoi( optarg );
- break;
+ case 'h': /* the servers host */
+ host = strdup( optarg );
+ break;
- case 'D': /* the servers manager */
- manager = strdup( optarg );
+ case 'p': /* the servers port */
+ port = atoi( optarg );
break;
- case 'w': /* the server managers password */
- passwd = strdup( optarg );
+ case 'D': /* the servers manager */
+ manager = strdup( optarg );
break;
- case 'f': /* file with entry search request */
- filename = strdup( optarg );
- break;
+ case 'w': /* the server managers password */
+ passwd = strdup( optarg );
+ break;
- case 'l': /* the number of loops */
- loops = atoi( optarg );
- break;
+ case 'f': /* file with entry search request */
+ filename = strdup( optarg );
+ break;
- default:
- usage( argv[0] );
- break;
+ case 'l': /* the number of loops */
+ loops = atoi( optarg );
+ break;
+
+ case 'r':
+ retries = atoi( optarg );
+ break;
+
+ default:
+ usage( argv[0] );
+ break;
}
}
- if (( filename == NULL ) || ( port == -1 ) ||
+ if (( filename == NULL ) || ( port == -1 && uri == NULL ) ||
( manager == NULL ) || ( passwd == NULL ))
usage( argv[0] );
}
- do_addel( host, port, manager, passwd, entry, attrs, loops );
+ do_addel( uri, host, port, manager, passwd, entry, attrs,
+ loops, retries );
exit( EXIT_SUCCESS );
}
perror( "malloc" );
exit( EXIT_FAILURE );
}
- SAFEMEMCPY( bvp->bv_val, value, vlen );
+ AC_MEMCPY( bvp->bv_val, value, vlen );
bvp->bv_val[ vlen ] = '\0';
}
}
static void
do_addel(
+ char *uri,
char *host,
int port,
char *manager,
char *passwd,
char *entry,
LDAPMod **attrs,
- int maxloop
+ int maxloop,
+ int maxretries
)
{
- LDAP *ld;
- int i;
+ LDAP *ld = NULL;
+ int i = 0, do_retry = maxretries;
pid_t pid = getpid();
+ int rc = LDAP_SUCCESS;
- if (( ld = ldap_init( host, port )) == NULL ) {
+retry:;
+ if ( uri ) {
+ ldap_initialize( &ld, uri );
+ } else {
+ ld = ldap_init( host, port );
+ }
+ if ( ld == NULL ) {
perror( "ldap_init" );
exit( EXIT_FAILURE );
}
- if ( ldap_bind_s( ld, manager, passwd, LDAP_AUTH_SIMPLE )
- != LDAP_SUCCESS ) {
- ldap_perror( ld, "ldap_bind" );
- exit( EXIT_FAILURE );
+ {
+ int version = LDAP_VERSION3;
+ (void) ldap_set_option( ld, LDAP_OPT_PROTOCOL_VERSION,
+ &version );
}
+ if ( do_retry == maxretries ) {
+ fprintf( stderr, "PID=%ld - Add/Delete(%d): entry=\"%s\".\n",
+ (long) pid, maxloop, entry );
+ }
- fprintf( stderr, "PID=%ld - Add/Delete(%d): entry=\"%s\".\n",
- (long) pid, maxloop, entry );
+ rc = ldap_bind_s( ld, manager, passwd, LDAP_AUTH_SIMPLE );
+ if ( rc != LDAP_SUCCESS ) {
+ ldap_perror( ld, "ldap_bind" );
+ if ( rc == LDAP_BUSY && do_retry > 0 ) {
+ do_retry--;
+ goto retry;
+ }
+ exit( EXIT_FAILURE );
+ }
- for ( i = 0; i < maxloop; i++ ) {
+ for ( ; i < maxloop; i++ ) {
/* add the entry */
- if ( ldap_add_s( ld, entry, attrs ) != LDAP_SUCCESS ) {
-
+ rc = ldap_add_s( ld, entry, attrs );
+ if ( rc != LDAP_SUCCESS ) {
ldap_perror( ld, "ldap_add" );
+ if ( rc == LDAP_BUSY && do_retry > 0 ) {
+ do_retry--;
+ goto retry;
+ }
break;
}
+#if 0
/* wait a second for the add to really complete */
+ /* This masks some race conditions though. */
sleep( 1 );
+#endif
/* now delete the entry again */
- if ( ldap_delete_s( ld, entry ) != LDAP_SUCCESS ) {
-
+ rc = ldap_delete_s( ld, entry );
+ if ( rc != LDAP_SUCCESS ) {
ldap_perror( ld, "ldap_delete" );
+ if ( rc == LDAP_BUSY && do_retry > 0 ) {
+ do_retry--;
+ goto retry;
+ }
break;
-
}
-
}
- fprintf( stderr, " PID=%ld - Add/Delete done.\n", (long) pid );
+ fprintf( stderr, " PID=%ld - Add/Delete done (%d).\n", (long) pid, rc );
ldap_unbind( ld );
}
projects / openldap / blobdiff