automerge commit

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

diff --git a/.cleancount b/.cleancount
index 45a4fb75db864000d01701c0f7a51864bd4daabf..ec635144f60048986bc560c5576355344005e6e7 100644 (file)
--- a/.cleancount
+++ b/.cleancount
@@ -1 +1 @@
-8
+9

diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c
index b73887f7f256c97089f28aff7c9629fb0050d21e..70c9a17294d9ac8db66f5eab0b22dd4af1fd3461 100644 (file)
--- a/apps/app_voicemail.c
+++ b/apps/app_voicemail.c
@@ -5545,12 +5545,13 @@ static int vm_exec(struct ast_channel *chan, void *data)
 static int append_mailbox(char *context, char *mbox, char *data)
 {
        /* Assumes lock is already held */
-       char tmp[256] = "";
+       char *tmp;
        char *stringp;
        char *s;
        struct ast_vm_user *vmu;
 
-       ast_copy_string(tmp, data, sizeof(tmp));
+       tmp = ast_strdupa(data);
+
        vmu = malloc(sizeof(struct ast_vm_user));
        if (vmu) {
                memset(vmu, 0, sizeof(struct ast_vm_user));

diff --git a/asterisk.c b/asterisk.c
index a5f07a2b223fbc24f63e2a3c3be1287206755b04..9cfdc565d58e597b25de2bfaa56b9595f7ef3da5 100644 (file)
--- a/asterisk.c
+++ b/asterisk.c
@@ -2417,7 +2417,7 @@ int main(int argc, char *argv[])
                                        buf[strlen(buf)-1] = '\0';
 
                                consolehandler((char *)buf);
-                       } else {
+                       } else if (option_remote) {
                                if (write(STDOUT_FILENO, "\nUse EXIT or QUIT to exit the asterisk console\n",
                                          strlen("\nUse EXIT or QUIT to exit the asterisk console\n")) < 0) {
                                        /* Whoa, stdout disappeared from under us... Make /dev/null's */

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 917123e1e29ba90a86d3fc6fc61c8588c0267c98..c1aef6a417a81281b122a6bd7bd43cd4f17992c7 100644 (file)
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -7830,7 +7830,7 @@ static int sip_show_objects(int fd, int argc, char *argv[])
        return RESULT_SUCCESS;
 }
 /*! \brief  print_group: Print call group and pickup group ---*/
-static void  print_group(int fd, unsigned int group, int crlf) 
+static void  print_group(int fd, ast_group_t group, int crlf) 
 {
        char buf[256];
        ast_cli(fd, crlf ? "%s\r\n" : "%s\n", ast_print_group(buf, sizeof(buf), group) );

diff --git a/include/asterisk/channel.h b/include/asterisk/channel.h
index ae2f7a7814557ffdad972642e39f0067d1dbaf81..38b33ed2d31859b21f3bca7516b2b769f56faba6 100644 (file)
--- a/include/asterisk/channel.h
+++ b/include/asterisk/channel.h
@@ -389,8 +389,8 @@ struct ast_channel {
        /* A linked list for variables */
        struct varshead varshead;
 
-       unsigned int callgroup;
-       unsigned int pickupgroup;
+       ast_group_t callgroup;
+       ast_group_t pickupgroup;
 
        /*! channel flags of AST_FLAG_ type */
        unsigned int flags;