From: Automerge script <automerge@asterisk.org>
Date: Tue, 26 Sep 2006 21:01:50 +0000 (+0000)
Subject: automerge commit
X-Git-Tag: 1.2.13-netsec~36
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4c6fb3dd378ea7f454a2acafa976731ed450c283;p=thirdparty%2Fasterisk.git

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 45a4fb75db..ec635144f6 100644
--- a/.cleancount
+++ b/.cleancount
@@ -1 +1 @@
-8
+9
diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c
index b73887f7f2..70c9a17294 100644
--- 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 a5f07a2b22..9cfdc565d5 100644
--- 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 917123e1e2..c1aef6a417 100644
--- 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 ae2f7a7814..38b33ed2d3 100644
--- 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;