Index: channels/chan_h323.c
===================================================================
--- channels/chan_h323.c	(revision 69258)
+++ channels/chan_h323.c	(working copy)
@@ -536,7 +536,7 @@
 			ast_log(LOG_DTMF, "Begin sending inband digit %c on %s\n", digit, c->name);
 		}
 		pvt->txDtmfDigit = digit;
-		token = pvt->cd.call_token ? strdup(pvt->cd.call_token) : NULL;
+		token = pvt->cd.call_token ? ast_strdup(pvt->cd.call_token) : NULL;
 		ast_mutex_unlock(&pvt->lock);
 		h323_send_tone(token, digit);
 		if (token) {
@@ -575,7 +575,7 @@
 			ast_log(LOG_DTMF, "End sending inband digit %c on %s, duration %d\n", digit, c->name, duration);
 		}
 		pvt->txDtmfDigit = ' ';
-		token = pvt->cd.call_token ? strdup(pvt->cd.call_token) : NULL;
+		token = pvt->cd.call_token ? ast_strdup(pvt->cd.call_token) : NULL;
 		ast_mutex_unlock(&pvt->lock);
 		h323_send_tone(token, ' ');
 		if (token) {
@@ -680,7 +680,7 @@
 		ast_log(LOG_DEBUG, "Answering on %s\n", c->name);
 
 	ast_mutex_lock(&pvt->lock);
-	token = pvt->cd.call_token ? strdup(pvt->cd.call_token) : NULL;
+	token = pvt->cd.call_token ? ast_strdup(pvt->cd.call_token) : NULL;
 	ast_mutex_unlock(&pvt->lock);
 	res = h323_answering_call(token, 0);
 	if (token)
@@ -739,7 +739,7 @@
 
 	/* Start the process if it's not already started */
 	if (!pvt->alreadygone && !pvt->hangupcause) {
-		call_token = pvt->cd.call_token ? strdup(pvt->cd.call_token) : NULL;
+		call_token = pvt->cd.call_token ? ast_strdup(pvt->cd.call_token) : NULL;
 		if (call_token) {
 			/* Release lock to eliminate deadlock */
 			ast_mutex_unlock(&pvt->lock);
@@ -877,7 +877,7 @@
 	int got_progress;
 
 	ast_mutex_lock(&pvt->lock);
-	token = (pvt->cd.call_token ? strdup(pvt->cd.call_token) : NULL);
+	token = (pvt->cd.call_token ? ast_strdup(pvt->cd.call_token) : NULL);
 	got_progress = pvt->got_progress;
 	if (condition == AST_CONTROL_PROGRESS)
 		pvt->got_progress = 1;
@@ -1092,7 +1092,7 @@
 		ch->cid.cid_ton = pvt->cd.type_of_number;
 
 		if (!ast_strlen_zero(pvt->exten) && strcmp(pvt->exten, "s")) {
-			ch->cid.cid_dnid = strdup(pvt->exten);
+			ch->cid.cid_dnid = ast_strdup(pvt->exten);
 		}
 		if (pvt->cd.transfer_capability >= 0)
 			ch->transfercapability = pvt->cd.transfer_capability;
Index: channels/chan_vpb.cc
===================================================================
--- channels/chan_vpb.cc	(revision 69258)
+++ channels/chan_vpb.cc	(working copy)
@@ -688,8 +688,8 @@
 			
 			if (cli_struct->ra_cldn[0]=='\0'){
 				/*
-				owner->cid.cid_num = strdup(cli_struct->cldn);
-				owner->cid.cid_name = strdup(cli_struct->cn);
+				owner->cid.cid_num = ast_strdup(cli_struct->cldn);
+				owner->cid.cid_name = ast_strdup(cli_struct->cn);
 				*/
 				if (owner){
 					ast_set_callerid(owner, cli_struct->cldn, cli_struct->cn, cli_struct->cldn);
@@ -2694,7 +2694,7 @@
 	int oldformat;
 	struct vpb_pvt *p;
 	struct ast_channel *tmp = NULL;
-	char *name = strdup(data ? (char *)data : "");
+	char *name = ast_strdup(data ? (char *)data : "");
 	char *s, *sepstr;
 	int group=-1;
 
@@ -2940,7 +2940,7 @@
 			} else if (strcasecmp(v->name, "language") == 0) {
 				strncpy(language, v->value, sizeof(language)-1);
 			} else if (strcasecmp(v->name, "callerid") == 0) {
-				callerid = strdup(v->value);
+				callerid = ast_strdup(v->value);
 			} else if (strcasecmp(v->name, "mode") == 0) {
 				if (strncasecmp(v->value, "di", 2) == 0) 
 					mode = MODE_DIALTONE;
Index: channels/iax2-provision.c
===================================================================
--- channels/iax2-provision.c	(revision 69258)
+++ channels/iax2-provision.c	(working copy)
@@ -169,7 +169,7 @@
 	ast_mutex_lock(&provlock);
 	for (c = templates; c; c = c->next) {
 		if (!strncasecmp(word, c->name, wordlen) && ++which > state) {
-			ret = strdup(c->name);
+			ret = ast_strdup(c->name);
 			break;
 		}
 	}
Index: channels/chan_misdn.c
===================================================================
--- channels/chan_misdn.c	(revision 69258)
+++ channels/chan_misdn.c	(working copy)
@@ -1410,7 +1410,7 @@
 		ast_mutex_unlock(&c->lock);
 	}
 	if (c) {
-		ret = strdup(c->name);
+		ret = ast_strdup(c->name);
 		ast_mutex_unlock(&c->lock);
 	} else
 		ret = NULL;
@@ -1430,13 +1430,13 @@
 	switch (pos) {
 	case 4:
 		if (*word == 'p')
-			return strdup("port");
+			return ast_strdup("port");
 		else if (*word == 'o')
-			return strdup("only");
+			return ast_strdup("only");
 		break;
 	case 6:
 		if (*word == 'o')
-			return strdup("only");
+			return ast_strdup("only");
 		break;
 	}
 	return NULL;
@@ -1453,15 +1453,15 @@
 	switch (pos) {
 	case 3:
 		if ((!strncmp(word, "description", wordlen)) && (++which > state))
-			return strdup("description");
+			return ast_strdup("description");
 		if ((!strncmp(word, "descriptions", wordlen)) && (++which > state))
-			return strdup("descriptions");
+			return ast_strdup("descriptions");
 		if ((!strncmp(word, "0", wordlen)) && (++which > state))
-			return strdup("0");
+			return ast_strdup("0");
 		while ((port = misdn_cfg_get_next_port(port)) != -1) {
 			snprintf(buffer, sizeof(buffer), "%d", port);
 			if ((!strncmp(word, buffer, wordlen)) && (++which > state)) {
-				return strdup(buffer);
+				return ast_strdup(buffer);
 			}
 		}
 		break;
@@ -1473,14 +1473,14 @@
 				misdn_cfg_get_name(elem, buffer, sizeof(buffer));
 				if (!wordlen || !strncmp(word, buffer, wordlen)) {
 					if (++which > state)
-						return strdup(buffer);
+						return ast_strdup(buffer);
 				}
 			}
 		} else if (strstr(line, "descriptions ")) {
 			if ((!wordlen || !strncmp(word, "general", wordlen)) && (++which > state))
-				return strdup("general");
+				return ast_strdup("general");
 			if ((!wordlen || !strncmp(word, "ports", wordlen)) && (++which > state))
-				return strdup("ports");
+				return ast_strdup("ports");
 		}
 		break;
 	}
@@ -1896,7 +1896,7 @@
 		if ( !ast_strlen_zero(bc->rad) ) {
 			if (ast->cid.cid_rdnis)
 				ast_free(ast->cid.cid_rdnis);
-			ast->cid.cid_rdnis = strdup(bc->rad);
+			ast->cid.cid_rdnis = ast_strdup(bc->rad);
 		}
 	
 		misdn_cfg_get(bc->port, MISDN_CFG_OVERLAP_DIAL, &ch->overlap_dial, sizeof(ch->overlap_dial));