diff options
| author | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2005-12-11 06:17:36 +0000 |
|---|---|---|
| committer | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2005-12-11 06:17:36 +0000 |
| commit | d0bde5055ea59c07cdfa2ce46bd6f00bc6d988f9 (patch) | |
| tree | bcdb4da9a935c0588ceec134c4a92113eb555394 | |
| parent | 8ca09cb9474e4775f0e0ac48b10e8f6d71f00a52 (diff) | |
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: http://svn.digium.com/svn/asterisk/trunk@7431 f38db490-d61c-443f-a65b-d21fe96a405b
| -rw-r--r-- | apps/app_voicemail.c | 2 | ||||
| -rw-r--r-- | utils/astman.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c index dec07f918..c15b39ff6 100644 --- 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 20ae8ec87..c74f5f787 100644 --- 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]); |