Index: cdr.c
===================================================================
RCS file: /usr/cvsroot/asterisk/cdr.c,v
retrieving revision 1.37
diff -u -r1.37 cdr.c
--- cdr.c	15 May 2005 02:42:59 -0000	1.37
+++ cdr.c	20 May 2005 18:08:17 -0000
@@ -29,7 +29,7 @@
 #include "asterisk/utils.h"
 
 int ast_default_amaflags = AST_CDR_DOCUMENTATION;
-char ast_default_accountcode[20] = "";
+char ast_default_accountcode[AST_MAX_ACCOUNT_CODE] = "";
 
 struct ast_cdr_beitem {
 	char name[20];
Index: channels/chan_iax2.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/chan_iax2.c,v
retrieving revision 1.294
diff -u -r1.294 chan_iax2.c
--- channels/chan_iax2.c	19 May 2005 04:31:02 -0000	1.294
+++ channels/chan_iax2.c	20 May 2005 18:08:25 -0000
@@ -196,7 +196,7 @@
 static int test_jitpct = 0;
 #endif /* IAXTESTS */
 
-static char accountcode[20];
+static char accountcode[AST_MAX_ACCOUNT_CODE];
 static int amaflags = 0;
 static int delayreject = 0;
 static int iax2_encryption = 0;
@@ -249,7 +249,7 @@
 	char dbsecret[80];
 	int authmethods;
 	int encmethods;
-	char accountcode[20];
+	char accountcode[AST_MAX_ACCOUNT_CODE];
 	char inkeys[80];				/* Key(s) this user can use to authenticate to us */
 	char language[MAX_LANGUAGE];
 	int amaflags;
@@ -544,7 +544,7 @@
 	int calling_tns;
 	int calling_pres;
 	char dproot[AST_MAX_EXTENSION];
-	char accountcode[20];
+	char accountcode[AST_MAX_ACCOUNT_CODE];
 	int amaflags;
 	struct iax2_dpcache *dpentries;
 	struct ast_variable *vars;
Index: channels/chan_mgcp.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/chan_mgcp.c,v
retrieving revision 1.121
diff -u -r1.121 chan_mgcp.c
--- channels/chan_mgcp.c	15 May 2005 03:21:51 -0000	1.121
+++ channels/chan_mgcp.c	20 May 2005 18:08:28 -0000
@@ -211,7 +211,7 @@
 
 /*static int callprogress = 0;*/
 
-static char accountcode[20] = "";
+static char accountcode[AST_MAX_ACCOUNT_CODE] = "";
 
 static char mailbox[AST_MAX_EXTENSION];
 
@@ -361,7 +361,7 @@
 	ast_mutex_t lock;
 	char name[80];
 	struct mgcp_subchannel *sub;		/* pointer to our current connection, channel and stuff */
-	char accountcode[20];
+	char accountcode[AST_MAX_ACCOUNT_CODE];
 	char exten[AST_MAX_EXTENSION];		/* Extention where to start */
 	char context[AST_MAX_EXTENSION];
 	char language[MAX_LANGUAGE];
Index: channels/chan_sip.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/chan_sip.c,v
retrieving revision 1.739
diff -u -r1.739 chan_sip.c
--- channels/chan_sip.c	20 May 2005 03:14:41 -0000	1.739
+++ channels/chan_sip.c	20 May 2005 18:08:37 -0000
@@ -446,7 +446,7 @@
 	char cid_name[256];			/* Caller*ID */
 	char via[256];				/* Via: header */
 	char fullcontact[128];			/* The Contact: that the UA registers with us */
-	char accountcode[20];			/* Account code */
+	char accountcode[AST_MAX_ACCOUNT_CODE];	/* Account code */
 	char our_contact[256];			/* Our contact header */
 	char realm[MAXHOSTNAMELEN];		/* Authorization realm */
 	char nonce[256];			/* Authorization nonce */
@@ -512,7 +512,7 @@
 	char context[AST_MAX_EXTENSION];	/* Default context for incoming calls */
 	char cid_num[80];		/* Caller ID num */
 	char cid_name[80];		/* Caller ID name */
-	char accountcode[20];		/* Account code */
+	char accountcode[AST_MAX_ACCOUNT_CODE];	/* Account code */
 	char language[MAX_LANGUAGE];	/* Default language for this user */
 	char musicclass[MAX_LANGUAGE];  /* Music on Hold class */
 	char useragent[256];		/* User agent in SIP request */
@@ -541,7 +541,7 @@
 	struct sip_auth *auth;		/* Realm authentication list */
 	char context[AST_MAX_EXTENSION];	/* Default context for incoming calls */
 	char username[80];		/* Temporary username until registration */ 
-	char accountcode[20];		/* Account code */
+	char accountcode[AST_MAX_ACCOUNT_CODE];	/* Account code */
 	int amaflags;			/* AMA Flags (for billing) */
 	char tohost[MAXHOSTNAMELEN];	/* If not dynamic, IP address */
 	char regexten[AST_MAX_EXTENSION]; /* Extension to register (if regcontext is used) */
Index: channels/chan_skinny.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/chan_skinny.c,v
retrieving revision 1.73
diff -u -r1.73 chan_skinny.c
--- channels/chan_skinny.c	15 May 2005 03:21:51 -0000	1.73
+++ channels/chan_skinny.c	20 May 2005 18:08:40 -0000
@@ -597,7 +597,7 @@
 static int transfer = 0;
 static int cancallforward = 0;
 /* static int busycount = 3;*/
-static char accountcode[20] = "";
+static char accountcode[AST_MAX_ACCOUNT_CODE] = "";
 static char mailbox[AST_MAX_EXTENSION];
 static int amaflags = 0;
 static int callnums = 1;
@@ -732,7 +732,7 @@
 	char name[80];
 	char label[42];					/* Label that shows next to the line buttons */
   	struct skinny_subchannel *sub;			/* pointer to our current connection, channel and stuff */
-	char accountcode[80];
+	char accountcode[AST_MAX_ACCOUNT_CODE];
 	char exten[AST_MAX_EXTENSION];			/* Extention where to start */
 	char context[AST_MAX_EXTENSION];
 	char language[MAX_LANGUAGE];
Index: channels/chan_zap.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/chan_zap.c,v
retrieving revision 1.447
diff -u -r1.447 chan_zap.c
--- channels/chan_zap.c	16 May 2005 19:15:56 -0000	1.447
+++ channels/chan_zap.c	20 May 2005 18:08:48 -0000
@@ -229,7 +229,7 @@
 
 static int callprogress = 0;
 
-static char accountcode[20] = "";
+static char accountcode[AST_MAX_ACCOUNT_CODE] = "";
 
 static char mailbox[AST_MAX_EXTENSION];
 
@@ -579,7 +579,7 @@
 	int destroy;
 	int ignoredtmf;				
 	int inalarm;
-	char accountcode[20];		/* Account code */
+	char accountcode[AST_MAX_ACCOUNT_CODE];		/* Account code */
 	int amaflags;				/* AMA Flags */
 	char didtdd;				/* flag to say its done it once */
 	struct tdd_state *tdd;		/* TDD flag */
Index: channels/h323/chan_h323.h
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/h323/chan_h323.h,v
retrieving revision 1.42
diff -u -r1.42 chan_h323.h
--- channels/h323/chan_h323.h	19 May 2005 19:13:19 -0000	1.42
+++ channels/h323/chan_h323.h	20 May 2005 18:08:48 -0000
@@ -49,7 +49,7 @@
 	char context[80];
 	char secret[80];
 	char callerid[80];
-	char accountcode[20];
+	char accountcode[AST_MAX_ACCOUNT_CODE];
 	int amaflags;
 	int capability;
 	int bridge;
Index: include/asterisk/cdr.h
===================================================================
RCS file: /usr/cvsroot/asterisk/include/asterisk/cdr.h,v
retrieving revision 1.24
diff -u -r1.24 cdr.h
--- include/asterisk/cdr.h	4 May 2005 15:56:44 -0000	1.24
+++ include/asterisk/cdr.h	20 May 2005 18:08:49 -0000
@@ -35,6 +35,7 @@
 #define AST_CDR_DOCUMENTATION			(3)
 
 #define AST_MAX_USER_FIELD			256
+#define AST_MAX_ACCOUNT_CODE			20
 
 struct ast_channel;
 AST_LIST_HEAD(varshead,ast_var_t);
@@ -72,7 +73,7 @@
 	/*! What flags to use */
 	int amaflags;				
 	/*! What account number to use */
-	char accountcode[20];			
+	char accountcode[AST_MAX_ACCOUNT_CODE];			
 	/*! flags */
 	unsigned int flags;				
 	/* Unique Channel Identifier */
@@ -258,7 +259,7 @@
 
 extern int ast_default_amaflags;
 
-extern char ast_default_accountcode[20];
+extern char ast_default_accountcode[AST_MAX_ACCOUNT_CODE];
 
 extern struct ast_cdr *ast_cdr_append(struct ast_cdr *cdr, struct ast_cdr *newcdr);
 
Index: include/asterisk/channel.h
===================================================================
RCS file: /usr/cvsroot/asterisk/include/asterisk/channel.h,v
retrieving revision 1.84
diff -u -r1.84 channel.h
--- include/asterisk/channel.h	15 May 2005 04:48:30 -0000	1.84
+++ include/asterisk/channel.h	20 May 2005 18:08:50 -0000
@@ -278,7 +278,7 @@
 	/*! Set BEFORE PBX is started to determine AMA flags */
 	int 	amaflags;			
 	/*! Account code for billing */
-	char 	accountcode[20];		
+	char 	accountcode[AST_MAX_ACCOUNT_CODE];		
 	/*! Call Detail Record */
 	struct ast_cdr *cdr;			
 	/*! Whether or not ADSI is detected on CPE */