make sure -i propagates correctly

This commit is contained in:
Pierangelo Masarati 2006-12-03 21:34:24 +00:00
parent a76b702d4c
commit dd5e44d496
7 changed files with 22 additions and 15 deletions

View File

@ -87,8 +87,9 @@ main( int argc, char **argv )
tester_init( "slapd-addel", TESTER_ADDEL );
while ( (i = getopt( argc, argv, "CFH:h:p:D:w:f:l:L:r:t:" )) != EOF ) {
switch( i ) {
while ( ( i = getopt( argc, argv, "CD:Ff:H:h:i:L:l:p:r:t:w:" ) ) != EOF )
{
switch ( i ) {
case 'C':
chaserefs++;
break;

View File

@ -120,8 +120,9 @@ main( int argc, char **argv )
/* by default, tolerate invalid credentials */
tester_ignore_str2errlist( "INVALID_CREDENTIALS" );
while ( (i = getopt( argc, argv, "a:b:B:H:h:i:p:D:w:l:L:f:FIt:" )) != EOF ) {
switch( i ) {
while ( ( i = getopt( argc, argv, "a:B:b:D:Ff:H:h:Ii:L:l:p:t:w:" ) ) != EOF )
{
switch ( i ) {
case 'a':
pwattr = optarg;
break;

View File

@ -81,7 +81,8 @@ main( int argc, char **argv )
tester_init( "slapd-modify", TESTER_MODIFY );
while ( (i = getopt( argc, argv, "CFH:h:i:p:D:w:e:a:l:L:r:t:" )) != EOF ) {
while ( ( i = getopt( argc, argv, "a:CD:e:FH:h:i:L:l:p:r:t:w:" ) ) != EOF )
{
switch ( i ) {
case 'C':
chaserefs++;

View File

@ -82,8 +82,9 @@ main( int argc, char **argv )
tester_init( "slapd-modrdn", TESTER_MODRDN );
while ( (i = getopt( argc, argv, "CFH:h:i:p:D:w:e:l:L:r:t:" )) != EOF ) {
switch( i ) {
while ( ( i = getopt( argc, argv, "CD:e:FH:h:i:L:l:p:r:t:w:" ) ) != EOF )
{
switch ( i ) {
case 'C':
chaserefs++;
break;

View File

@ -96,8 +96,8 @@ main( int argc, char **argv )
/* by default, tolerate referrals and no such object */
tester_ignore_str2errlist( "REFERRAL,NO_SUCH_OBJECT" );
while ( (i = getopt( argc, argv, "ACD:H:h:i:p:e:Ff:l:L:r:t:w:" )) != EOF ) {
switch( i ) {
while ( (i = getopt( argc, argv, "ACD:e:Ff:H:h:i:L:l:p:r:t:w:" )) != EOF ) {
switch ( i ) {
case 'A':
noattrs++;
break;

View File

@ -98,8 +98,9 @@ main( int argc, char **argv )
/* by default, tolerate referrals and no such object */
tester_ignore_str2errlist( "REFERRAL,NO_SUCH_OBJECT" );
while ( ( i = getopt( argc, argv, "Aa:b:CD:f:FH:h:i:l:L:Np:w:r:t:" ) ) != EOF ) {
switch( i ) {
while ( ( i = getopt( argc, argv, "Aa:b:CD:f:FH:h:i:l:L:Np:r:t:w:" ) ) != EOF )
{
switch ( i ) {
case 'A':
noattrs++;
break;

View File

@ -205,14 +205,14 @@ main( int argc, char **argv )
mloops[0] = '\0';
bloops[0] = '\0';
while ( (i = getopt( argc, argv, "AB:CD:d:FH:h:Ii:j:l:L:NP:p:r:t:Ww:y:" )) != EOF ) {
switch( i ) {
while ( ( i = getopt( argc, argv, "AB:CD:d:FH:h:Ii:j:L:l:NP:p:r:t:Ww:y:" ) ) != EOF )
{
switch ( i ) {
case 'A':
noattrs++;
break;
case 'B':
{
case 'B': {
char **p,
**b = ldap_str2charray( optarg, "," );
extra_t **epp;
@ -357,7 +357,9 @@ main( int argc, char **argv )
if (( dirname == NULL ) || ( port == NULL && uri == NULL ) ||
( manager == NULL ) || ( passwd == NULL ) || ( progdir == NULL ))
{
usage( argv[0], '\0' );
}
#ifdef HAVE_WINSOCK
children = malloc( maxkids * sizeof(HANDLE) );