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

........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@7431 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c
index dec07f918c29e616ce1515b7858815593c1ed52d..c15b39ff6a914ea2e5d3e00c646345668132a2c5 100644 (file)
--- a/apps/app_voicemail.c
+++ b/apps/app_voicemail.c
@@ -582,7 +582,7 @@ static struct ast_vm_user *find_user(struct ast_vm_user *ivm, const char *contex
        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;
        }

diff --git a/utils/astman.c b/utils/astman.c
index 20ae8ec872a7ebf8ac0d7fb25f12f0ee592630cd..c74f5f7871e8fa4e336c8f15e9bb344b3fb70597 100644 (file)
--- a/utils/astman.c
+++ b/utils/astman.c
@@ -660,8 +660,8 @@ static int login(char *hostname)
                                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]);