+/* $OpenLDAP$ */
+/*
+ * Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved.
+ * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+ */
#include "portable.h"
#include <stdio.h>
-#include <ac/string.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>
-#include <sys/param.h>
-
-#include "lber.h"
-#include "ldap.h"
+#include <ldap.h>
#define LOOPS 100
get_add_entry( char *filename, LDAPMod ***mods );
static void
-do_addel( char *host, int port, char *manager, char *passwd,
+do_addel( char *uri, char *host, int port, char *manager, char *passwd,
char *dn, LDAPMod **attrs, int maxloop );
static void
{
fprintf( stderr, "usage: %s [-h <host>] -p port -D <managerDN> -w <passwd> -f <addfile> [-l <loops>]\n",
name );
- exit( 1 );
+ exit( EXIT_FAILURE );
}
int
main( int argc, char **argv )
{
- int i, j;
+ int i;
char *host = "localhost";
+ char *uri = NULL;
int port = -1;
char *manager = NULL;
char *passwd = NULL;
int loops = LOOPS;
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:" )) != EOF ) {
switch( i ) {
+ case 'H': /* the server's URI */
+ uri = strdup( optarg );
+ break;
case 'h': /* the servers host */
host = strdup( optarg );
break;
}
}
- if (( filename == NULL ) || ( port == -1 ) ||
+ if (( filename == NULL ) || ( port == -1 && uri == NULL ) ||
( manager == NULL ) || ( passwd == NULL ))
usage( argv[0] );
fprintf( stderr, "%s: invalid entry DN in file \"%s\".\n",
argv[0], filename );
- exit( 1 );
+ exit( EXIT_FAILURE );
}
fprintf( stderr, "%s: invalid attrs in file \"%s\".\n",
argv[0], filename );
- exit( 1 );
+ exit( EXIT_FAILURE );
}
- do_addel( host, port, manager, passwd, entry, attrs, loops );
+ do_addel( uri, host, port, manager, passwd, entry, attrs, loops );
- exit( 0 );
+ exit( EXIT_SUCCESS );
}
-#define safe_realloc( ptr, size ) ( ptr == NULL ? malloc( size ) : \
- realloc( ptr, size ))
-
-
static void
addmodifyop( LDAPMod ***pmodsp, int modop, char *attr, char *value, int vlen )
{
}
if ( pmods == NULL || pmods[ i ] == NULL ) {
- if (( pmods = (LDAPMod **)safe_realloc( pmods, (i + 2) *
+ if (( pmods = (LDAPMod **)realloc( pmods, (i + 2) *
sizeof( LDAPMod * ))) == NULL ) {
- perror( "safe_realloc" );
- exit( 1 );
+ perror( "realloc" );
+ exit( EXIT_FAILURE );
}
*pmodsp = pmods;
pmods[ i + 1 ] = NULL;
if (( pmods[ i ] = (LDAPMod *)calloc( 1, sizeof( LDAPMod )))
== NULL ) {
perror( "calloc" );
- exit( 1 );
+ exit( EXIT_FAILURE );
}
pmods[ i ]->mod_op = modop;
if (( pmods[ i ]->mod_type = strdup( attr )) == NULL ) {
perror( "strdup" );
- exit( 1 );
+ exit( EXIT_FAILURE );
}
}
}
}
if (( pmods[ i ]->mod_bvalues =
- (struct berval **)safe_realloc( pmods[ i ]->mod_bvalues,
+ (struct berval **)ber_memrealloc( pmods[ i ]->mod_bvalues,
(j + 2) * sizeof( struct berval * ))) == NULL ) {
- perror( "safe_realloc" );
- exit( 1 );
+ perror( "ber_realloc" );
+ exit( EXIT_FAILURE );
}
pmods[ i ]->mod_bvalues[ j + 1 ] = NULL;
- if (( bvp = (struct berval *)malloc( sizeof( struct berval )))
+ if (( bvp = (struct berval *)ber_memalloc( sizeof( struct berval )))
== NULL ) {
perror( "malloc" );
- exit( 1 );
+ exit( EXIT_FAILURE );
}
pmods[ i ]->mod_bvalues[ j ] = bvp;
bvp->bv_len = vlen;
if (( bvp->bv_val = (char *)malloc( vlen + 1 )) == NULL ) {
perror( "malloc" );
- exit( 1 );
+ exit( EXIT_FAILURE );
}
- SAFEMEMCPY( bvp->bv_val, value, vlen );
+ AC_MEMCPY( bvp->bv_val, value, vlen );
bvp->bv_val[ vlen ] = '\0';
}
}
FILE *fp;
char *entry = NULL;
- if ( fp = fopen( filename, "r" )) {
+ if ( (fp = fopen( filename, "r" )) != NULL ) {
char line[BUFSIZ];
if ( fgets( line, BUFSIZ, fp )) {
static void
do_addel(
+ char *uri,
char *host,
int port,
char *manager,
int maxloop
)
{
- LDAP *ld;
+ LDAP *ld = NULL;
int i;
pid_t pid = getpid();
- if (( ld = ldap_init( host, port )) == NULL ) {
+ if ( uri ) {
+ ldap_initialize( &ld, uri );
+ } else {
+ ld = ldap_init( host, port );
+ }
+ if ( ld == NULL ) {
perror( "ldap_init" );
- exit( 1 );
+ exit( EXIT_FAILURE );
+ }
+
+ {
+ int version = LDAP_VERSION3;
+ (void) ldap_set_option( ld, LDAP_OPT_PROTOCOL_VERSION,
+ &version );
}
if ( ldap_bind_s( ld, manager, passwd, LDAP_AUTH_SIMPLE )
!= LDAP_SUCCESS ) {
ldap_perror( ld, "ldap_bind" );
- exit( 1 );
+ exit( EXIT_FAILURE );
}
fprintf( stderr, "PID=%ld - Add/Delete(%d): entry=\"%s\".\n",
- pid, maxloop, entry );
+ (long) pid, maxloop, entry );
for ( i = 0; i < maxloop; i++ ) {
}
- fprintf( stderr, " PID=%ld - Add/Delete done.\n", pid );
+ fprintf( stderr, " PID=%ld - Add/Delete done.\n", (long) pid );
ldap_unbind( ld );
}