Must use ch_strdup, not strdup

This commit is contained in:
Howard Chu 2006-08-29 01:36:52 +00:00
parent f4da18e7e4
commit 8ae4cbe643
2 changed files with 8 additions and 8 deletions

View File

@ -283,7 +283,7 @@ slap_tool_init(
while ( (i = getopt( argc, argv, options )) != EOF ) { while ( (i = getopt( argc, argv, options )) != EOF ) {
switch ( i ) { switch ( i ) {
case 'a': case 'a':
filterstr = strdup( optarg ); filterstr = ch_strdup( optarg );
break; break;
case 'b': case 'b':
@ -320,11 +320,11 @@ slap_tool_init(
break; break;
case 'f': /* specify a conf file */ case 'f': /* specify a conf file */
conffile = strdup( optarg ); conffile = ch_strdup( optarg );
break; break;
case 'F': /* specify a conf dir */ case 'F': /* specify a conf dir */
confdir = strdup( optarg ); confdir = ch_strdup( optarg );
break; break;
case 'g': /* disable subordinate glue */ case 'g': /* disable subordinate glue */
@ -338,7 +338,7 @@ slap_tool_init(
break; break;
case 'l': /* LDIF file */ case 'l': /* LDIF file */
ldiffile = strdup( optarg ); ldiffile = ch_strdup( optarg );
break; break;
case 'M': case 'M':
@ -383,7 +383,7 @@ slap_tool_init(
if ( tool == SLAPADD ) if ( tool == SLAPADD )
mode |= SLAP_TOOL_NO_SCHEMA_CHECK; mode |= SLAP_TOOL_NO_SCHEMA_CHECK;
else if ( tool == SLAPCAT ) else if ( tool == SLAPCAT )
subtree = strdup( optarg ); subtree = ch_strdup( optarg );
break; break;
case 't': /* turn on truncate */ case 't': /* turn on truncate */

View File

@ -108,7 +108,7 @@ slappasswd( int argc, char *argv[] )
return EXIT_FAILURE; return EXIT_FAILURE;
} else { } else {
scheme = strdup( optarg ); scheme = ch_strdup( optarg );
} }
break; break;
@ -127,7 +127,7 @@ slappasswd( int argc, char *argv[] )
} else { } else {
char* p; char* p;
newpw = strdup( optarg ); newpw = ch_strdup( optarg );
for( p = optarg; *p != '\0'; p++ ) { for( p = optarg; *p != '\0'; p++ ) {
*p = '\0'; *p = '\0';
@ -172,7 +172,7 @@ slappasswd( int argc, char *argv[] )
if( newpw == NULL ) { if( newpw == NULL ) {
/* prompt for new password */ /* prompt for new password */
char *cknewpw; char *cknewpw;
newpw = strdup(getpassphrase("New password: ")); newpw = ch_strdup(getpassphrase("New password: "));
cknewpw = getpassphrase("Re-enter new password: "); cknewpw = getpassphrase("Re-enter new password: ");
if( strcmp( newpw, cknewpw )) { if( strcmp( newpw, cknewpw )) {