[asterisk-commits] trunk - r7431 in /trunk: ./ apps/app_voicemail.c utils/astman.c

[asterisk-commits at lists.digium.com]

Author: russell
Date: Sun Dec 11 00:17:36 2005
New Revision: 7431

URL: http://svn.digium.com/view/asterisk?rev=7431&view=rev
Log:
Merged revisions 7404,7406,7425,7427,7429-7430 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r7404 | tilghman | 2005-12-08 18:32:08 -0500 (Thu, 08 Dec 2005) | 2 lines

Documenting two keywords that were previously missing

........
r7406 | tilghman | 2005-12-08 18:45:36 -0500 (Thu, 08 Dec 2005) | 2 lines

Bug 5960

........
r7425 | bweschke | 2005-12-10 13:10:50 -0500 (Sat, 10 Dec 2005) | 4 lines

 Bug #5877
 Make sure the digit string from E&M wink DNIS collection is properly null terminated as it grows.


........
r7427 | tilghman | 2005-12-10 20:15:15 -0500 (Sat, 10 Dec 2005) | 2 lines

Bug 5967

........
r7429 | tilghman | 2005-12-10 20:26:51 -0500 (Sat, 10 Dec 2005) | 2 lines

Bug 5965 - major bug in AST_LIST_REMOVE

........
r7430 | russell | 2005-12-11 01:08:56 -0500 (Sun, 11 Dec 2005) | 2 lines

silence a couple of compiler warnings about pointer signedness

........

Modified:
    trunk/   (props changed)
    trunk/apps/app_voicemail.c
    trunk/utils/astman.c

Propchange: trunk/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Sun Dec 11 00:17:36 2005
@@ -1,1 +1,1 @@
-/branches/1.2:1-7386
+/branches/1.2:1-7430

Modified: trunk/apps/app_voicemail.c
URL: http://svn.digium.com/view/asterisk/trunk/apps/app_voicemail.c?rev=7431&r1=7430&r2=7431&view=diff
==============================================================================
--- trunk/apps/app_voicemail.c (original)
+++ trunk/apps/app_voicemail.c Sun Dec 11 00:17:36 2005
@@ -582,7 +582,7 @@
 	while (cur) {
 		if (ast_test_flag((&globalflags), VM_SEARCH) && !strcasecmp(mailbox, cur->mailbox))
 			break;
-		if ((!strcasecmp(context, cur->context)) && (!strcasecmp(mailbox, cur->mailbox)))
+		if (context && (!strcasecmp(context, cur->context)) && (!strcasecmp(mailbox, cur->mailbox)))
 			break;
 		cur=cur->next;
 	}

Modified: trunk/utils/astman.c
URL: http://svn.digium.com/view/asterisk/trunk/utils/astman.c?rev=7431&r1=7430&r2=7431&view=diff
==============================================================================
--- trunk/utils/astman.c (original)
+++ trunk/utils/astman.c Sun Dec 11 00:17:36 2005
@@ -660,8 +660,8 @@
 				struct MD5Context md5;
 				unsigned char digest[16];
 				MD5Init(&md5);
-				MD5Update(&md5, challenge, strlen(challenge));
-				MD5Update(&md5, pass, strlen(pass));
+				MD5Update(&md5, (unsigned char *)challenge, strlen(challenge));
+				MD5Update(&md5, (unsigned char *)pass, strlen(pass));
 				MD5Final(digest, &md5);
 				for (x=0; x<16; x++)
 					len += sprintf(md5key + len, "%2.2x", digest[x]);