ruby-ldap 0.9.19 → 0.9.20
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +7 -7
- data/ChangeLog +4 -0
- data/NOTES +6 -0
- data/conn.c +3 -0
- data/ldap.c +3 -0
- data/rbldap.h +2 -2
- data/test/bind-ldaps.rb +1 -1
- data/test/bind-ssl.rb +1 -1
- data/test/bind.rb +1 -1
- data/test/compare.rb +1 -1
- data/test/ext.rb +9 -9
- data/test/modrdn.rb +2 -2
- data/test/moz_cert.rb +15 -15
- data/test/search.rb +2 -2
- data/test/search2.rb +2 -2
- data/test/search3.rb +1 -1
- data/test/setup.rb +3 -3
- data/test/tc_conn.rb +0 -1
- data/test/tc_ldif.rb +4 -4
- data/test/tc_search.rb +18 -18
- metadata +33 -51
- data/test/openldap_tests/progs/ldif-filter.c +0 -256
- data/test/openldap_tests/progs/slapd-addel.c +0 -435
- data/test/openldap_tests/progs/slapd-auth.c +0 -335
- data/test/openldap_tests/progs/slapd-bind.c +0 -609
- data/test/openldap_tests/progs/slapd-common.c +0 -300
- data/test/openldap_tests/progs/slapd-common.h +0 -44
- data/test/openldap_tests/progs/slapd-modify.c +0 -318
- data/test/openldap_tests/progs/slapd-modrdn.c +0 -310
- data/test/openldap_tests/progs/slapd-mtread.c +0 -837
- data/test/openldap_tests/progs/slapd-read.c +0 -568
- data/test/openldap_tests/progs/slapd-search.c +0 -618
- data/test/openldap_tests/progs/slapd-tester.c +0 -1197
@@ -1,256 +0,0 @@
|
|
1
|
-
/* ldif-filter -- clean up LDIF testdata from stdin */
|
2
|
-
/* $OpenLDAP$ */
|
3
|
-
/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
|
4
|
-
*
|
5
|
-
* Copyright 2009-2016 The OpenLDAP Foundation.
|
6
|
-
* All rights reserved.
|
7
|
-
*
|
8
|
-
* Redistribution and use in source and binary forms, with or without
|
9
|
-
* modification, are permitted only as authorized by the OpenLDAP
|
10
|
-
* Public License.
|
11
|
-
*
|
12
|
-
* A copy of this license is available in file LICENSE in the
|
13
|
-
* top-level directory of the distribution or, alternatively, at
|
14
|
-
* <http://www.OpenLDAP.org/license.html>.
|
15
|
-
*/
|
16
|
-
|
17
|
-
#include "portable.h"
|
18
|
-
|
19
|
-
#include <stdio.h>
|
20
|
-
#include <ac/ctype.h>
|
21
|
-
#include <ac/stdlib.h>
|
22
|
-
#include <ac/string.h>
|
23
|
-
#include <ac/unistd.h>
|
24
|
-
#ifdef _WIN32
|
25
|
-
#include <fcntl.h>
|
26
|
-
#endif
|
27
|
-
|
28
|
-
#define DEFAULT_SPECS "ndb=a,null=n"
|
29
|
-
|
30
|
-
typedef struct { char *val; size_t len, alloc; } String;
|
31
|
-
typedef struct { String *val; size_t len, alloc; } Strings;
|
32
|
-
|
33
|
-
/* Flags and corresponding program options */
|
34
|
-
enum { SORT_ATTRS = 1, SORT_ENTRIES = 2, NO_OUTPUT = 4, DUMMY_FLAG = 8 };
|
35
|
-
static const char spec_options[] = "aen"; /* option index = log2(enum flag) */
|
36
|
-
|
37
|
-
static const char *progname = "ldif-filter";
|
38
|
-
static const String null_string = { NULL, 0, 0 };
|
39
|
-
|
40
|
-
static void
|
41
|
-
usage( void )
|
42
|
-
{
|
43
|
-
fprintf( stderr, "\
|
44
|
-
Usage: %s [-b backend] [-s spec[,spec]...]\n\
|
45
|
-
Filter standard input by first <spec> matching '[<backend>]=[a][e][n]':\n\
|
46
|
-
- Remove LDIF comments.\n\
|
47
|
-
- 'a': Sort attributes in entries.\n\
|
48
|
-
- 'e': Sort any entries separated by just one empty line.\n\
|
49
|
-
- 'n': Output nothing.\n\
|
50
|
-
<backend> defaults to the $BACKEND environment variable.\n\
|
51
|
-
Use specs '%s' if no spec on the command line applies.\n",
|
52
|
-
progname, DEFAULT_SPECS );
|
53
|
-
exit( EXIT_FAILURE );
|
54
|
-
}
|
55
|
-
|
56
|
-
/* Return flags from "backend=flags" in spec; nonzero if backend found */
|
57
|
-
static unsigned
|
58
|
-
get_flags( const char *backend, const char *spec )
|
59
|
-
{
|
60
|
-
size_t len = strlen( backend );
|
61
|
-
unsigned flags = DUMMY_FLAG;
|
62
|
-
const char *end, *tmp;
|
63
|
-
|
64
|
-
for ( ;; spec = end + ( *end != '\0' )) {
|
65
|
-
if ( !*spec )
|
66
|
-
return 0;
|
67
|
-
end = spec + strcspn( spec, "," );
|
68
|
-
if ( !(tmp = memchr( spec, '=', end-spec )))
|
69
|
-
break;
|
70
|
-
if ( tmp-spec == len && !memcmp( spec, backend, len )) {
|
71
|
-
spec = tmp+1;
|
72
|
-
break;
|
73
|
-
}
|
74
|
-
}
|
75
|
-
|
76
|
-
for ( ; spec < end; spec++ ) {
|
77
|
-
if ( (tmp = strchr( spec_options, *spec )) == NULL ) {
|
78
|
-
usage();
|
79
|
-
}
|
80
|
-
flags |= 1U << (tmp - spec_options);
|
81
|
-
}
|
82
|
-
return flags;
|
83
|
-
}
|
84
|
-
|
85
|
-
#define APPEND(s /* String or Strings */, data, count, isString) do { \
|
86
|
-
size_t slen = (s)->len, salloc = (s)->alloc, sz = sizeof *(s)->val; \
|
87
|
-
if ( salloc <= slen + (count) ) { \
|
88
|
-
(s)->alloc = salloc += salloc + ((count)|7) + 1; \
|
89
|
-
(s)->val = xrealloc( (s)->val, sz * salloc ); \
|
90
|
-
} \
|
91
|
-
memcpy( (s)->val + slen, data, sz * ((count) + !!(isString)) ); \
|
92
|
-
(s)->len = slen + (count); \
|
93
|
-
} while (0)
|
94
|
-
|
95
|
-
static void *
|
96
|
-
xrealloc( void *ptr, size_t len )
|
97
|
-
{
|
98
|
-
if ( (ptr = realloc( ptr, len )) == NULL ) {
|
99
|
-
perror( progname );
|
100
|
-
exit( EXIT_FAILURE );
|
101
|
-
}
|
102
|
-
return ptr;
|
103
|
-
}
|
104
|
-
|
105
|
-
static int
|
106
|
-
cmp( const void *s, const void *t )
|
107
|
-
{
|
108
|
-
return strcmp( ((const String *) s)->val, ((const String *) t)->val );
|
109
|
-
}
|
110
|
-
|
111
|
-
static void
|
112
|
-
sort_strings( Strings *ss, size_t offset )
|
113
|
-
{
|
114
|
-
qsort( ss->val + offset, ss->len - offset, sizeof(*ss->val), cmp );
|
115
|
-
}
|
116
|
-
|
117
|
-
/* Build entry ss[n] from attrs ss[n...], and free the attrs */
|
118
|
-
static void
|
119
|
-
build_entry( Strings *ss, size_t n, unsigned flags, size_t new_len )
|
120
|
-
{
|
121
|
-
String *vals = ss->val, *e = &vals[n];
|
122
|
-
size_t end = ss->len;
|
123
|
-
char *ptr;
|
124
|
-
|
125
|
-
if ( flags & SORT_ATTRS ) {
|
126
|
-
sort_strings( ss, n + 1 );
|
127
|
-
}
|
128
|
-
e->val = xrealloc( e->val, e->alloc = new_len + 1 );
|
129
|
-
ptr = e->val + e->len;
|
130
|
-
e->len = new_len;
|
131
|
-
ss->len = ++n;
|
132
|
-
for ( ; n < end; free( vals[n++].val )) {
|
133
|
-
ptr = strcpy( ptr, vals[n].val ) + vals[n].len;
|
134
|
-
}
|
135
|
-
assert( ptr == e->val + new_len );
|
136
|
-
}
|
137
|
-
|
138
|
-
/* Flush entries to stdout and free them */
|
139
|
-
static void
|
140
|
-
flush_entries( Strings *ss, const char *sep, unsigned flags )
|
141
|
-
{
|
142
|
-
size_t i, end = ss->len;
|
143
|
-
const char *prefix = "";
|
144
|
-
|
145
|
-
if ( flags & SORT_ENTRIES ) {
|
146
|
-
sort_strings( ss, 0 );
|
147
|
-
}
|
148
|
-
for ( i = 0; i < end; i++, prefix = sep ) {
|
149
|
-
if ( printf( "%s%s", prefix, ss->val[i].val ) < 0 ) {
|
150
|
-
perror( progname );
|
151
|
-
exit( EXIT_FAILURE );
|
152
|
-
}
|
153
|
-
free( ss->val[i].val );
|
154
|
-
}
|
155
|
-
ss->len = 0;
|
156
|
-
}
|
157
|
-
|
158
|
-
static void
|
159
|
-
filter_stdin( unsigned flags )
|
160
|
-
{
|
161
|
-
char line[256];
|
162
|
-
Strings ss = { NULL, 0, 0 }; /* entries + attrs of partial entry */
|
163
|
-
size_t entries = 0, attrs_totlen = 0, line_len;
|
164
|
-
const char *entry_sep = "\n", *sep = "";
|
165
|
-
int comment = 0, eof = 0, eol, prev_eol = 1; /* flags */
|
166
|
-
String *s;
|
167
|
-
|
168
|
-
/* LDIF = Entries ss[..entries-1] + sep + attrs ss[entries..] + line */
|
169
|
-
for ( ; !eof || ss.len || *sep; prev_eol = eol ) {
|
170
|
-
if ( eof || (eof = !fgets( line, sizeof(line), stdin ))) {
|
171
|
-
strcpy( line, prev_eol ? "" : *sep ? sep : "\n" );
|
172
|
-
}
|
173
|
-
line_len = strlen( line );
|
174
|
-
eol = (line_len == 0 || line[line_len - 1] == '\n');
|
175
|
-
|
176
|
-
if ( *line == ' ' ) { /* continuation line? */
|
177
|
-
prev_eol = 0;
|
178
|
-
} else if ( prev_eol ) { /* start of logical line? */
|
179
|
-
comment = (*line == '#');
|
180
|
-
}
|
181
|
-
if ( comment || (flags & NO_OUTPUT) ) {
|
182
|
-
continue;
|
183
|
-
}
|
184
|
-
|
185
|
-
/* Collect attrs for partial entry in ss[entries...] */
|
186
|
-
if ( !prev_eol && attrs_totlen != 0 ) {
|
187
|
-
goto grow_attr;
|
188
|
-
} else if ( line_len > (*line == '\r' ? 2 : 1) ) {
|
189
|
-
APPEND( &ss, &null_string, 1, 0 ); /* new attr */
|
190
|
-
grow_attr:
|
191
|
-
s = &ss.val[ss.len - 1];
|
192
|
-
APPEND( s, line, line_len, 1 ); /* strcat to attr */
|
193
|
-
attrs_totlen += line_len;
|
194
|
-
continue;
|
195
|
-
}
|
196
|
-
|
197
|
-
/* Empty line - consume sep+attrs or entries+sep */
|
198
|
-
if ( attrs_totlen != 0 ) {
|
199
|
-
entry_sep = sep;
|
200
|
-
if ( entries == 0 )
|
201
|
-
fputs( sep, stdout );
|
202
|
-
build_entry( &ss, entries++, flags, attrs_totlen );
|
203
|
-
attrs_totlen = 0;
|
204
|
-
} else {
|
205
|
-
flush_entries( &ss, entry_sep, flags );
|
206
|
-
fputs( sep, stdout );
|
207
|
-
entries = 0;
|
208
|
-
}
|
209
|
-
sep = "\r\n" + 2 - line_len; /* sep = copy(line) */
|
210
|
-
}
|
211
|
-
|
212
|
-
free( ss.val );
|
213
|
-
}
|
214
|
-
|
215
|
-
int
|
216
|
-
main( int argc, char **argv )
|
217
|
-
{
|
218
|
-
const char *backend = getenv( "BACKEND" ), *specs = "", *tmp;
|
219
|
-
unsigned flags;
|
220
|
-
int i;
|
221
|
-
|
222
|
-
if ( argc > 0 ) {
|
223
|
-
progname = (tmp = strrchr( argv[0], '/' )) ? tmp+1 : argv[0];
|
224
|
-
}
|
225
|
-
|
226
|
-
while ( (i = getopt( argc, argv, "b:s:" )) != EOF ) {
|
227
|
-
switch ( i ) {
|
228
|
-
case 'b':
|
229
|
-
backend = optarg;
|
230
|
-
break;
|
231
|
-
case 's':
|
232
|
-
specs = optarg;
|
233
|
-
break;
|
234
|
-
default:
|
235
|
-
usage();
|
236
|
-
}
|
237
|
-
}
|
238
|
-
if ( optind < argc ) {
|
239
|
-
usage();
|
240
|
-
}
|
241
|
-
if ( backend == NULL ) {
|
242
|
-
backend = "";
|
243
|
-
}
|
244
|
-
|
245
|
-
#ifdef _WIN32
|
246
|
-
_setmode(1, _O_BINARY); /* don't convert \n to \r\n on stdout */
|
247
|
-
#endif
|
248
|
-
flags = get_flags( backend, specs );
|
249
|
-
filter_stdin( flags ? flags : get_flags( backend, DEFAULT_SPECS ));
|
250
|
-
if ( fclose( stdout ) == EOF ) {
|
251
|
-
perror( progname );
|
252
|
-
return EXIT_FAILURE;
|
253
|
-
}
|
254
|
-
|
255
|
-
return EXIT_SUCCESS;
|
256
|
-
}
|
@@ -1,435 +0,0 @@
|
|
1
|
-
/* $OpenLDAP$ */
|
2
|
-
/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
|
3
|
-
*
|
4
|
-
* Copyright 1999-2016 The OpenLDAP Foundation.
|
5
|
-
* All rights reserved.
|
6
|
-
*
|
7
|
-
* Redistribution and use in source and binary forms, with or without
|
8
|
-
* modification, are permitted only as authorized by the OpenLDAP
|
9
|
-
* Public License.
|
10
|
-
*
|
11
|
-
* A copy of this license is available in file LICENSE in the
|
12
|
-
* top-level directory of the distribution or, alternatively, at
|
13
|
-
* <http://www.OpenLDAP.org/license.html>.
|
14
|
-
*/
|
15
|
-
/* ACKNOWLEDGEMENTS:
|
16
|
-
* This work was initially developed by Kurt Spanier for inclusion
|
17
|
-
* in OpenLDAP Software.
|
18
|
-
*/
|
19
|
-
|
20
|
-
#include "portable.h"
|
21
|
-
|
22
|
-
#include <stdio.h>
|
23
|
-
|
24
|
-
#include "ac/stdlib.h"
|
25
|
-
|
26
|
-
#include "ac/ctype.h"
|
27
|
-
#include "ac/param.h"
|
28
|
-
#include "ac/socket.h"
|
29
|
-
#include "ac/string.h"
|
30
|
-
#include "ac/unistd.h"
|
31
|
-
#include "ac/wait.h"
|
32
|
-
|
33
|
-
#include "ldap.h"
|
34
|
-
#include "lutil.h"
|
35
|
-
|
36
|
-
#include "slapd-common.h"
|
37
|
-
|
38
|
-
#define LOOPS 100
|
39
|
-
#define RETRIES 0
|
40
|
-
|
41
|
-
static char *
|
42
|
-
get_add_entry( char *filename, LDAPMod ***mods );
|
43
|
-
|
44
|
-
static void
|
45
|
-
do_addel( char *uri, char *manager, struct berval *passwd,
|
46
|
-
char *dn, LDAPMod **attrs, int maxloop, int maxretries, int delay,
|
47
|
-
int friendly, int chaserefs );
|
48
|
-
|
49
|
-
static void
|
50
|
-
usage( char *name )
|
51
|
-
{
|
52
|
-
fprintf( stderr,
|
53
|
-
"usage: %s "
|
54
|
-
"-H <uri> | ([-h <host>] -p <port>) "
|
55
|
-
"-D <manager> "
|
56
|
-
"-w <passwd> "
|
57
|
-
"-f <addfile> "
|
58
|
-
"[-i <ignore>] "
|
59
|
-
"[-l <loops>] "
|
60
|
-
"[-L <outerloops>] "
|
61
|
-
"[-r <maxretries>] "
|
62
|
-
"[-t <delay>] "
|
63
|
-
"[-F] "
|
64
|
-
"[-C]\n",
|
65
|
-
name );
|
66
|
-
exit( EXIT_FAILURE );
|
67
|
-
}
|
68
|
-
|
69
|
-
int
|
70
|
-
main( int argc, char **argv )
|
71
|
-
{
|
72
|
-
int i;
|
73
|
-
char *host = "localhost";
|
74
|
-
char *uri = NULL;
|
75
|
-
int port = -1;
|
76
|
-
char *manager = NULL;
|
77
|
-
struct berval passwd = { 0, NULL };
|
78
|
-
char *filename = NULL;
|
79
|
-
char *entry = NULL;
|
80
|
-
int loops = LOOPS;
|
81
|
-
int outerloops = 1;
|
82
|
-
int retries = RETRIES;
|
83
|
-
int delay = 0;
|
84
|
-
int friendly = 0;
|
85
|
-
int chaserefs = 0;
|
86
|
-
LDAPMod **attrs = NULL;
|
87
|
-
|
88
|
-
tester_init( "slapd-addel", TESTER_ADDEL );
|
89
|
-
|
90
|
-
while ( ( i = getopt( argc, argv, "CD:Ff:H:h:i:L:l:p:r:t:w:" ) ) != EOF )
|
91
|
-
{
|
92
|
-
switch ( i ) {
|
93
|
-
case 'C':
|
94
|
-
chaserefs++;
|
95
|
-
break;
|
96
|
-
|
97
|
-
case 'F':
|
98
|
-
friendly++;
|
99
|
-
break;
|
100
|
-
|
101
|
-
case 'H': /* the server's URI */
|
102
|
-
uri = strdup( optarg );
|
103
|
-
break;
|
104
|
-
|
105
|
-
case 'h': /* the servers host */
|
106
|
-
host = strdup( optarg );
|
107
|
-
break;
|
108
|
-
|
109
|
-
case 'i':
|
110
|
-
/* ignored (!) by now */
|
111
|
-
break;
|
112
|
-
|
113
|
-
case 'p': /* the servers port */
|
114
|
-
if ( lutil_atoi( &port, optarg ) != 0 ) {
|
115
|
-
usage( argv[0] );
|
116
|
-
}
|
117
|
-
break;
|
118
|
-
|
119
|
-
case 'D': /* the servers manager */
|
120
|
-
manager = strdup( optarg );
|
121
|
-
break;
|
122
|
-
|
123
|
-
case 'w': /* the server managers password */
|
124
|
-
passwd.bv_val = strdup( optarg );
|
125
|
-
passwd.bv_len = strlen( optarg );
|
126
|
-
memset( optarg, '*', passwd.bv_len );
|
127
|
-
break;
|
128
|
-
|
129
|
-
case 'f': /* file with entry search request */
|
130
|
-
filename = strdup( optarg );
|
131
|
-
break;
|
132
|
-
|
133
|
-
case 'l': /* the number of loops */
|
134
|
-
if ( lutil_atoi( &loops, optarg ) != 0 ) {
|
135
|
-
usage( argv[0] );
|
136
|
-
}
|
137
|
-
break;
|
138
|
-
|
139
|
-
case 'L': /* the number of outerloops */
|
140
|
-
if ( lutil_atoi( &outerloops, optarg ) != 0 ) {
|
141
|
-
usage( argv[0] );
|
142
|
-
}
|
143
|
-
break;
|
144
|
-
|
145
|
-
case 'r': /* number of retries */
|
146
|
-
if ( lutil_atoi( &retries, optarg ) != 0 ) {
|
147
|
-
usage( argv[0] );
|
148
|
-
}
|
149
|
-
break;
|
150
|
-
|
151
|
-
case 't': /* delay in seconds */
|
152
|
-
if ( lutil_atoi( &delay, optarg ) != 0 ) {
|
153
|
-
usage( argv[0] );
|
154
|
-
}
|
155
|
-
break;
|
156
|
-
|
157
|
-
default:
|
158
|
-
usage( argv[0] );
|
159
|
-
break;
|
160
|
-
}
|
161
|
-
}
|
162
|
-
|
163
|
-
if (( filename == NULL ) || ( port == -1 && uri == NULL ) ||
|
164
|
-
( manager == NULL ) || ( passwd.bv_val == NULL ))
|
165
|
-
usage( argv[0] );
|
166
|
-
|
167
|
-
entry = get_add_entry( filename, &attrs );
|
168
|
-
if (( entry == NULL ) || ( *entry == '\0' )) {
|
169
|
-
|
170
|
-
fprintf( stderr, "%s: invalid entry DN in file \"%s\".\n",
|
171
|
-
argv[0], filename );
|
172
|
-
exit( EXIT_FAILURE );
|
173
|
-
|
174
|
-
}
|
175
|
-
|
176
|
-
if (( attrs == NULL ) || ( *attrs == '\0' )) {
|
177
|
-
|
178
|
-
fprintf( stderr, "%s: invalid attrs in file \"%s\".\n",
|
179
|
-
argv[0], filename );
|
180
|
-
exit( EXIT_FAILURE );
|
181
|
-
|
182
|
-
}
|
183
|
-
|
184
|
-
uri = tester_uri( uri, host, port );
|
185
|
-
|
186
|
-
for ( i = 0; i < outerloops; i++ ) {
|
187
|
-
do_addel( uri, manager, &passwd, entry, attrs,
|
188
|
-
loops, retries, delay, friendly, chaserefs );
|
189
|
-
}
|
190
|
-
|
191
|
-
exit( EXIT_SUCCESS );
|
192
|
-
}
|
193
|
-
|
194
|
-
|
195
|
-
static void
|
196
|
-
addmodifyop( LDAPMod ***pmodsp, int modop, char *attr, char *value, int vlen )
|
197
|
-
{
|
198
|
-
LDAPMod **pmods;
|
199
|
-
int i, j;
|
200
|
-
struct berval *bvp;
|
201
|
-
|
202
|
-
pmods = *pmodsp;
|
203
|
-
modop |= LDAP_MOD_BVALUES;
|
204
|
-
|
205
|
-
i = 0;
|
206
|
-
if ( pmods != NULL ) {
|
207
|
-
for ( ; pmods[ i ] != NULL; ++i ) {
|
208
|
-
if ( strcasecmp( pmods[ i ]->mod_type, attr ) == 0 &&
|
209
|
-
pmods[ i ]->mod_op == modop ) {
|
210
|
-
break;
|
211
|
-
}
|
212
|
-
}
|
213
|
-
}
|
214
|
-
|
215
|
-
if ( pmods == NULL || pmods[ i ] == NULL ) {
|
216
|
-
if (( pmods = (LDAPMod **)realloc( pmods, (i + 2) *
|
217
|
-
sizeof( LDAPMod * ))) == NULL ) {
|
218
|
-
tester_perror( "realloc", NULL );
|
219
|
-
exit( EXIT_FAILURE );
|
220
|
-
}
|
221
|
-
*pmodsp = pmods;
|
222
|
-
pmods[ i + 1 ] = NULL;
|
223
|
-
if (( pmods[ i ] = (LDAPMod *)calloc( 1, sizeof( LDAPMod )))
|
224
|
-
== NULL ) {
|
225
|
-
tester_perror( "calloc", NULL );
|
226
|
-
exit( EXIT_FAILURE );
|
227
|
-
}
|
228
|
-
pmods[ i ]->mod_op = modop;
|
229
|
-
if (( pmods[ i ]->mod_type = strdup( attr )) == NULL ) {
|
230
|
-
tester_perror( "strdup", NULL );
|
231
|
-
exit( EXIT_FAILURE );
|
232
|
-
}
|
233
|
-
}
|
234
|
-
|
235
|
-
if ( value != NULL ) {
|
236
|
-
j = 0;
|
237
|
-
if ( pmods[ i ]->mod_bvalues != NULL ) {
|
238
|
-
for ( ; pmods[ i ]->mod_bvalues[ j ] != NULL; ++j ) {
|
239
|
-
;
|
240
|
-
}
|
241
|
-
}
|
242
|
-
if (( pmods[ i ]->mod_bvalues =
|
243
|
-
(struct berval **)ber_memrealloc( pmods[ i ]->mod_bvalues,
|
244
|
-
(j + 2) * sizeof( struct berval * ))) == NULL ) {
|
245
|
-
tester_perror( "ber_memrealloc", NULL );
|
246
|
-
exit( EXIT_FAILURE );
|
247
|
-
}
|
248
|
-
pmods[ i ]->mod_bvalues[ j + 1 ] = NULL;
|
249
|
-
if (( bvp = (struct berval *)ber_memalloc( sizeof( struct berval )))
|
250
|
-
== NULL ) {
|
251
|
-
tester_perror( "ber_memalloc", NULL );
|
252
|
-
exit( EXIT_FAILURE );
|
253
|
-
}
|
254
|
-
pmods[ i ]->mod_bvalues[ j ] = bvp;
|
255
|
-
|
256
|
-
bvp->bv_len = vlen;
|
257
|
-
if (( bvp->bv_val = (char *)malloc( vlen + 1 )) == NULL ) {
|
258
|
-
tester_perror( "malloc", NULL );
|
259
|
-
exit( EXIT_FAILURE );
|
260
|
-
}
|
261
|
-
AC_MEMCPY( bvp->bv_val, value, vlen );
|
262
|
-
bvp->bv_val[ vlen ] = '\0';
|
263
|
-
}
|
264
|
-
}
|
265
|
-
|
266
|
-
|
267
|
-
static char *
|
268
|
-
get_add_entry( char *filename, LDAPMod ***mods )
|
269
|
-
{
|
270
|
-
FILE *fp;
|
271
|
-
char *entry = NULL;
|
272
|
-
|
273
|
-
if ( (fp = fopen( filename, "r" )) != NULL ) {
|
274
|
-
char line[BUFSIZ];
|
275
|
-
|
276
|
-
if ( fgets( line, BUFSIZ, fp )) {
|
277
|
-
char *nl;
|
278
|
-
|
279
|
-
if (( nl = strchr( line, '\r' )) || ( nl = strchr( line, '\n' )))
|
280
|
-
*nl = '\0';
|
281
|
-
nl = line;
|
282
|
-
if ( !strncasecmp( nl, "dn: ", 4 ))
|
283
|
-
nl += 4;
|
284
|
-
entry = strdup( nl );
|
285
|
-
|
286
|
-
}
|
287
|
-
|
288
|
-
while ( fgets( line, BUFSIZ, fp )) {
|
289
|
-
char *nl;
|
290
|
-
char *value;
|
291
|
-
|
292
|
-
if (( nl = strchr( line, '\r' )) || ( nl = strchr( line, '\n' )))
|
293
|
-
*nl = '\0';
|
294
|
-
|
295
|
-
if ( *line == '\0' ) break;
|
296
|
-
if ( !( value = strchr( line, ':' ))) break;
|
297
|
-
|
298
|
-
*value++ = '\0';
|
299
|
-
while ( *value && isspace( (unsigned char) *value ))
|
300
|
-
value++;
|
301
|
-
|
302
|
-
addmodifyop( mods, LDAP_MOD_ADD, line, value, strlen( value ));
|
303
|
-
|
304
|
-
}
|
305
|
-
fclose( fp );
|
306
|
-
}
|
307
|
-
|
308
|
-
return( entry );
|
309
|
-
}
|
310
|
-
|
311
|
-
|
312
|
-
static void
|
313
|
-
do_addel(
|
314
|
-
char *uri,
|
315
|
-
char *manager,
|
316
|
-
struct berval *passwd,
|
317
|
-
char *entry,
|
318
|
-
LDAPMod **attrs,
|
319
|
-
int maxloop,
|
320
|
-
int maxretries,
|
321
|
-
int delay,
|
322
|
-
int friendly,
|
323
|
-
int chaserefs )
|
324
|
-
{
|
325
|
-
LDAP *ld = NULL;
|
326
|
-
int i = 0, do_retry = maxretries;
|
327
|
-
int rc = LDAP_SUCCESS;
|
328
|
-
int version = LDAP_VERSION3;
|
329
|
-
|
330
|
-
retry:;
|
331
|
-
ldap_initialize( &ld, uri );
|
332
|
-
if ( ld == NULL ) {
|
333
|
-
tester_perror( "ldap_initialize", NULL );
|
334
|
-
exit( EXIT_FAILURE );
|
335
|
-
}
|
336
|
-
|
337
|
-
(void) ldap_set_option( ld, LDAP_OPT_PROTOCOL_VERSION, &version );
|
338
|
-
(void) ldap_set_option( ld, LDAP_OPT_REFERRALS,
|
339
|
-
chaserefs ? LDAP_OPT_ON : LDAP_OPT_OFF );
|
340
|
-
|
341
|
-
if ( do_retry == maxretries ) {
|
342
|
-
fprintf( stderr, "PID=%ld - Add/Delete(%d): entry=\"%s\".\n",
|
343
|
-
(long) pid, maxloop, entry );
|
344
|
-
}
|
345
|
-
|
346
|
-
rc = ldap_sasl_bind_s( ld, manager, LDAP_SASL_SIMPLE, passwd, NULL, NULL, NULL );
|
347
|
-
if ( rc != LDAP_SUCCESS ) {
|
348
|
-
tester_ldap_error( ld, "ldap_sasl_bind_s", NULL );
|
349
|
-
switch ( rc ) {
|
350
|
-
case LDAP_BUSY:
|
351
|
-
case LDAP_UNAVAILABLE:
|
352
|
-
if ( do_retry > 0 ) {
|
353
|
-
do_retry--;
|
354
|
-
if ( delay != 0 ) {
|
355
|
-
sleep( delay );
|
356
|
-
}
|
357
|
-
goto retry;
|
358
|
-
}
|
359
|
-
/* fallthru */
|
360
|
-
default:
|
361
|
-
break;
|
362
|
-
}
|
363
|
-
exit( EXIT_FAILURE );
|
364
|
-
}
|
365
|
-
|
366
|
-
for ( ; i < maxloop; i++ ) {
|
367
|
-
|
368
|
-
/* add the entry */
|
369
|
-
rc = ldap_add_ext_s( ld, entry, attrs, NULL, NULL );
|
370
|
-
if ( rc != LDAP_SUCCESS ) {
|
371
|
-
tester_ldap_error( ld, "ldap_add_ext_s", NULL );
|
372
|
-
switch ( rc ) {
|
373
|
-
case LDAP_ALREADY_EXISTS:
|
374
|
-
/* NOTE: this likely means
|
375
|
-
* the delete failed
|
376
|
-
* during the previous round... */
|
377
|
-
if ( !friendly ) {
|
378
|
-
goto done;
|
379
|
-
}
|
380
|
-
break;
|
381
|
-
|
382
|
-
case LDAP_BUSY:
|
383
|
-
case LDAP_UNAVAILABLE:
|
384
|
-
if ( do_retry > 0 ) {
|
385
|
-
do_retry--;
|
386
|
-
goto retry;
|
387
|
-
}
|
388
|
-
/* fall thru */
|
389
|
-
|
390
|
-
default:
|
391
|
-
goto done;
|
392
|
-
}
|
393
|
-
}
|
394
|
-
|
395
|
-
#if 0
|
396
|
-
/* wait a second for the add to really complete */
|
397
|
-
/* This masks some race conditions though. */
|
398
|
-
sleep( 1 );
|
399
|
-
#endif
|
400
|
-
|
401
|
-
/* now delete the entry again */
|
402
|
-
rc = ldap_delete_ext_s( ld, entry, NULL, NULL );
|
403
|
-
if ( rc != LDAP_SUCCESS ) {
|
404
|
-
tester_ldap_error( ld, "ldap_delete_ext_s", NULL );
|
405
|
-
switch ( rc ) {
|
406
|
-
case LDAP_NO_SUCH_OBJECT:
|
407
|
-
/* NOTE: this likely means
|
408
|
-
* the add failed
|
409
|
-
* during the previous round... */
|
410
|
-
if ( !friendly ) {
|
411
|
-
goto done;
|
412
|
-
}
|
413
|
-
break;
|
414
|
-
|
415
|
-
case LDAP_BUSY:
|
416
|
-
case LDAP_UNAVAILABLE:
|
417
|
-
if ( do_retry > 0 ) {
|
418
|
-
do_retry--;
|
419
|
-
goto retry;
|
420
|
-
}
|
421
|
-
/* fall thru */
|
422
|
-
|
423
|
-
default:
|
424
|
-
goto done;
|
425
|
-
}
|
426
|
-
}
|
427
|
-
}
|
428
|
-
|
429
|
-
done:;
|
430
|
-
fprintf( stderr, " PID=%ld - Add/Delete done (%d).\n", (long) pid, rc );
|
431
|
-
|
432
|
-
ldap_unbind_ext( ld, NULL, NULL );
|
433
|
-
}
|
434
|
-
|
435
|
-
|