[asterisk-commits] russell: branch 1.2-netsec r74320 - in /branches/1.2-netsec: ./ apps/ res/

[SVN commits to the Asterisk project]

Author: russell
Date: Tue Jul 10 10:45:46 2007
New Revision: 74320

URL: http://svn.digium.com/view/asterisk?view=rev&rev=74320
Log:
sync with 1.2 branch

Modified:
    branches/1.2-netsec/   (props changed)
    branches/1.2-netsec/apps/app_voicemail.c
    branches/1.2-netsec/res/res_config_odbc.c

Propchange: branches/1.2-netsec/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue Jul 10 10:45:46 2007
@@ -1,1 +1,1 @@
-/branches/1.2:1-74311
+/branches/1.2:1-74319

Modified: branches/1.2-netsec/apps/app_voicemail.c
URL: http://svn.digium.com/view/asterisk/branches/1.2-netsec/apps/app_voicemail.c?view=diff&rev=74320&r1=74319&r2=74320
==============================================================================
--- branches/1.2-netsec/apps/app_voicemail.c (original)
+++ branches/1.2-netsec/apps/app_voicemail.c Tue Jul 10 10:45:46 2007
@@ -318,7 +318,7 @@
 "           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";
 

Modified: branches/1.2-netsec/res/res_config_odbc.c
URL: http://svn.digium.com/view/asterisk/branches/1.2-netsec/res/res_config_odbc.c?view=diff&rev=74320&r1=74319&r2=74320
==============================================================================
--- branches/1.2-netsec/res/res_config_odbc.c (original)
+++ branches/1.2-netsec/res/res_config_odbc.c Tue Jul 10 10:45:46 2007
@@ -103,7 +103,8 @@
 		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 @@
 	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)) {