automerge commit

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

diff --git a/apps/app_queue.c b/apps/app_queue.c
index a35a3ee191600157b7606a34a1f058bd0642ba98..61cf456176b6a94930c4e8b293ff2128c96eefb8 100644 (file)
--- a/apps/app_queue.c
+++ b/apps/app_queue.c
@@ -431,6 +431,8 @@ static enum queue_member_status get_member_status(const struct ast_call_queue *q
        enum queue_member_status result = QUEUE_NO_MEMBERS;
 
        for (member = q->members; member; member = member->next) {
+               if (member->paused) continue;
+
                switch (member->status) {
                case AST_DEVICE_INVALID:
                        /* nothing to do */

diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c
index 214c7aff3c1f2987bca427dd59ad71c6d9e92902..b595944f2dd1aa7363307057ca7800001503a818 100644 (file)
--- a/apps/app_voicemail.c
+++ b/apps/app_voicemail.c
@@ -5310,7 +5310,7 @@ static int vm_execmain(struct ast_channel *chan, void *data)
 
                                case '5': /* Leave VoiceMail */
                                        if (ast_test_flag(vmu, VM_SVMAIL)) {
-                                               cmd = forward_message(chan, context, vms.curdir, vms.curmsg, vmu, vmfmts, 1, record_gain);
+                                               cmd = forward_message(chan, vmu->context, vms.curdir, vms.curmsg, vmu, vmfmts, 1, record_gain);
                                                if (cmd == ERROR_LOCK_PATH) {
                                                        res = cmd;
                                                        goto out;
@@ -5391,7 +5391,7 @@ static int vm_execmain(struct ast_channel *chan, void *data)
        
                case '8':
                        if (vms.lastmsg > -1) {
-                               cmd = forward_message(chan, context, vms.curdir, vms.curmsg, vmu, vmfmts, 0, record_gain);
+                               cmd = forward_message(chan, vmu->context, vms.curdir, vms.curmsg, vmu, vmfmts, 0, record_gain);
                                if (cmd == ERROR_LOCK_PATH) {
                                        res = cmd;
                                        goto out;

diff --git a/enum.c b/enum.c
index 0c3e925131d1496a38d7fc7d49b3550fde8fabbb..9daef1ef71af0fb25c805e1b5c3df05030882ed0 100644 (file)
--- a/enum.c
+++ b/enum.c
@@ -80,7 +80,7 @@ struct naptr {
 } __attribute__ ((__packed__));
 
 /*--- parse_ie: Parse NAPTR record information elements */
-static unsigned int parse_ie(char *data, unsigned int maxdatalen, char *src, unsigned int srclen)
+static unsigned int parse_ie(unsigned char *data, unsigned int maxdatalen, unsigned char *src, unsigned int srclen)
 {
        unsigned int len, olen;
 
@@ -101,7 +101,7 @@ static unsigned int parse_ie(char *data, unsigned int maxdatalen, char *src, uns
 }
 
 /*--- parse_naptr: Parse DNS NAPTR record used in ENUM ---*/
-static int parse_naptr(char *dst, int dstsize, char *tech, int techsize, char *answer, int len, char *naptrinput)
+static int parse_naptr(unsigned char *dst, int dstsize, char *tech, int techsize, unsigned char *answer, int len, unsigned char *naptrinput)
 {
        char tech_return[80];
        char *oanswer = answer;