revert -I for slapd-bind

This commit is contained in:
Pierangelo Masarati 2006-12-02 10:25:56 +00:00
parent c8a000cb7b
commit 2e4ab03f1f
2 changed files with 11 additions and 4 deletions

View file

@ -98,7 +98,7 @@ main( int argc, char **argv )
int outerloops = 1;
int force = 0;
int chaserefs = 0;
int noinit = 0;
int noinit = 1;
int delay = 0;
/* extra action to do after bind... */
@ -225,7 +225,7 @@ main( int argc, char **argv )
case 'I':
/* reuse connection */
noinit++;
noinit = 0;
break;
case 't':

View file

@ -125,6 +125,7 @@ main( int argc, char **argv )
int chaserefs = 0;
int noattrs = 0;
int nobind = 0;
int noinit = 1;
char *ignore = NULL;
/* search */
char *sfile = NULL;
@ -203,7 +204,7 @@ main( int argc, char **argv )
mloops[0] = '\0';
bloops[0] = '\0';
while ( (i = getopt( argc, argv, "AB:CD:d:FH:h:i:j:l:L:NP:p:r:t:w:Wy:" )) != EOF ) {
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++;
@ -252,6 +253,10 @@ main( int argc, char **argv )
host = strdup( optarg );
break;
case 'I':
noinit = 0;
break;
case 'i':
ignore = optarg;
break;
@ -696,7 +701,9 @@ main( int argc, char **argv )
snprintf( bcmd, sizeof bcmd, "%s" LDAP_DIRSEP BINDCMD,
progdir );
bargs[banum++] = bcmd;
bargs[banum++] = "-I"; /* don't init on each bind */
if ( !noinit ) {
bargs[banum++] = "-I"; /* init on each bind */
}
if ( uri ) {
bargs[banum++] = "-H";
bargs[banum++] = uri;