From 8ae4cbe643dc944e3d9d15b7890b260aa3039515 Mon Sep 17 00:00:00 2001 From: Howard Chu Date: Tue, 29 Aug 2006 01:36:52 +0000 Subject: [PATCH] Must use ch_strdup, not strdup --- servers/slapd/slapcommon.c | 10 +++++----- servers/slapd/slappasswd.c | 6 +++--- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/servers/slapd/slapcommon.c b/servers/slapd/slapcommon.c index b9ac4f1bee..7ba89edb5c 100644 --- a/servers/slapd/slapcommon.c +++ b/servers/slapd/slapcommon.c @@ -283,7 +283,7 @@ slap_tool_init( while ( (i = getopt( argc, argv, options )) != EOF ) { switch ( i ) { case 'a': - filterstr = strdup( optarg ); + filterstr = ch_strdup( optarg ); break; case 'b': @@ -320,11 +320,11 @@ slap_tool_init( break; case 'f': /* specify a conf file */ - conffile = strdup( optarg ); + conffile = ch_strdup( optarg ); break; case 'F': /* specify a conf dir */ - confdir = strdup( optarg ); + confdir = ch_strdup( optarg ); break; case 'g': /* disable subordinate glue */ @@ -338,7 +338,7 @@ slap_tool_init( break; case 'l': /* LDIF file */ - ldiffile = strdup( optarg ); + ldiffile = ch_strdup( optarg ); break; case 'M': @@ -383,7 +383,7 @@ slap_tool_init( if ( tool == SLAPADD ) mode |= SLAP_TOOL_NO_SCHEMA_CHECK; else if ( tool == SLAPCAT ) - subtree = strdup( optarg ); + subtree = ch_strdup( optarg ); break; case 't': /* turn on truncate */ diff --git a/servers/slapd/slappasswd.c b/servers/slapd/slappasswd.c index ea77df719d..6f7f861de4 100644 --- a/servers/slapd/slappasswd.c +++ b/servers/slapd/slappasswd.c @@ -108,7 +108,7 @@ slappasswd( int argc, char *argv[] ) return EXIT_FAILURE; } else { - scheme = strdup( optarg ); + scheme = ch_strdup( optarg ); } break; @@ -127,7 +127,7 @@ slappasswd( int argc, char *argv[] ) } else { char* p; - newpw = strdup( optarg ); + newpw = ch_strdup( optarg ); for( p = optarg; *p != '\0'; p++ ) { *p = '\0'; @@ -172,7 +172,7 @@ slappasswd( int argc, char *argv[] ) if( newpw == NULL ) { /* prompt for new password */ char *cknewpw; - newpw = strdup(getpassphrase("New password: ")); + newpw = ch_strdup(getpassphrase("New password: ")); cknewpw = getpassphrase("Re-enter new password: "); if( strcmp( newpw, cknewpw )) { -- 2.39.5