Merged revisions 108797 via svnmerge from

https://origsvn.digium.com/svn/asterisk/trunk

................
r108797 | russell | 2008-03-14 15:09:37 -0500 (Fri, 14 Mar 2008) | 13 lines

Merged revisions 108796 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r108796 | russell | 2008-03-14 15:09:22 -0500 (Fri, 14 Mar 2008) | 5 lines

Fix a channel name issue.  chan_oss registers the "Console" channel type,
but it created channels with an "OSS" prefix.

(closes issue #12194, reported by davidw, patched by me)

........

................


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

channels/chan_oss.c

@@ -789,7 +789,7 @@ static struct ast_channel *oss_new(struct chan_oss_pvt *o, char *ext, char *ctx,
 {
 	struct ast_channel *c;
 
-	c = ast_channel_alloc(1, state, o->cid_num, o->cid_name, "", ext, ctx, 0, "OSS/%s", o->device + 5);
+	c = ast_channel_alloc(1, state, o->cid_num, o->cid_name, "", ext, ctx, 0, "Console/%s", o->device + 5);
 	if (c == NULL)
 		return NULL;
 	c->tech = &oss_tech;