From: Russell Bryant <russell@russellbryant.com>
Date: Tue, 10 Jul 2007 15:45:46 +0000 (+0000)
Subject: sync with 1.2 branch
X-Git-Tag: 1.2.21.1-netsec~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bb95ee53b0f714bf505efc47a543e7d082d94587;p=thirdparty%2Fasterisk.git

sync with 1.2 branch

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@74320 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c
index 070ebcd5e5..b292eb2fbb 100644
--- a/apps/app_voicemail.c
+++ b/apps/app_voicemail.c
@@ -318,7 +318,7 @@ static char *descrip_vm =
 "           message. The units are whole-number decibels (dB).\n"
 "    s    - Skip the playback of instructions for leaving a message to the\n"
 "           calling party.\n"
-"    u    - Play the 'unavailable greeting.\n"
+"    u    - Play the 'unavailable' greeting.\n"
 "    j    - Jump to priority n+101 if the mailbox is not found or some other\n"
 "           error occurs.\n";
 
diff --git a/res/res_config_odbc.c b/res/res_config_odbc.c
index dbe37c289b..fcd4609cff 100644
--- a/res/res_config_odbc.c
+++ b/res/res_config_odbc.c
@@ -103,7 +103,8 @@ static struct ast_variable *realtime_odbc(const char *database, const char *tabl
 		newval = va_arg(aq, const char *);
 	}
 	va_end(aq);
-	snprintf(sql + strlen(sql), sizeof(sql) - strlen(sql), " ESCAPE '\\'");
+	if (strcasestr(sql, "LIKE"))
+		snprintf(sql + strlen(sql), sizeof(sql) - strlen(sql), " ESCAPE '\\'");
 
 	res = SQLPrepare(stmt, (unsigned char *)sql, SQL_NTS);
 	if ((res != SQL_SUCCESS) && (res != SQL_SUCCESS_WITH_INFO)) {
@@ -251,7 +252,8 @@ static struct ast_config *realtime_multi_odbc(const char *database, const char *
 	if (initfield)
 		snprintf(sql + strlen(sql), sizeof(sql) - strlen(sql), " ORDER BY %s", initfield);
 	va_end(aq);
-	snprintf(sql + strlen(sql), sizeof(sql) - strlen(sql), " ESCAPE '\\'");
+	if (strcasestr(sql, "LIKE"))
+		snprintf(sql + strlen(sql), sizeof(sql) - strlen(sql), " ESCAPE '\\'");
 
 	res = SQLPrepare(stmt, (unsigned char *)sql, SQL_NTS);
 	if ((res != SQL_SUCCESS) && (res != SQL_SUCCESS_WITH_INFO)) {