[asterisk-commits] qwell: trunk r77997 - in /trunk: ./ channels/ configs/

[SVN commits to the Asterisk project]

Author: qwell
Date: Thu Aug  2 16:54:54 2007
New Revision: 77997

URL: http://svn.digium.com/view/asterisk?view=rev&rev=77997
Log:
Merged revisions 77996 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

(closes issue #9779)
........
r77996 | qwell | 2007-08-02 16:53:39 -0500 (Thu, 02 Aug 2007) | 5 lines

Make sure we actually allow 6 chars to be sent.
Also make note of the "A" option of date format.

Issue 9779, modifications by DEA, wedhorn, and myself.

........

Modified:
    trunk/   (props changed)
    trunk/channels/chan_skinny.c
    trunk/configs/skinny.conf.sample

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/channels/chan_skinny.c
URL: http://svn.digium.com/view/asterisk/trunk/channels/chan_skinny.c?view=diff&rev=77997&r1=77996&r2=77997
==============================================================================
--- trunk/channels/chan_skinny.c (original)
+++ trunk/channels/chan_skinny.c Thu Aug  2 16:54:54 2007
@@ -3198,7 +3198,7 @@
 	req->data.regack.res[0] = '0';
 	req->data.regack.res[1] = '\0';
 	req->data.regack.keepAlive = htolel(keep_alive);
-	ast_copy_string(req->data.regack.dateTemplate, date_format, sizeof(req->data.regack.dateTemplate));
+	memcpy(req->data.regack.dateTemplate, date_format, sizeof(req->data.regack.dateTemplate));
 	req->data.regack.res2[0] = '0';
 	req->data.regack.res2[1] = '\0';
 	req->data.regack.secondaryKeepAlive = htolel(keep_alive);
@@ -5030,7 +5030,7 @@
 			}
 			ast_copy_string(regcontext, v->value, sizeof(regcontext));
 		} else if (!strcasecmp(v->name, "dateformat")) {
-			ast_copy_string(date_format, v->value, sizeof(date_format));
+			memcpy(date_format, v->value, sizeof(date_format));
 		} else if (!strcasecmp(v->name, "allow")) {
 			ast_parse_allow_disallow(&default_prefs, &default_capability, v->value, 1);
 		} else if (!strcasecmp(v->name, "disallow")) {

Modified: trunk/configs/skinny.conf.sample
URL: http://svn.digium.com/view/asterisk/trunk/configs/skinny.conf.sample?view=diff&rev=77997&r1=77996&r2=77997
==============================================================================
--- trunk/configs/skinny.conf.sample (original)
+++ trunk/configs/skinny.conf.sample Thu Aug  2 16:54:54 2007
@@ -4,7 +4,9 @@
 [general]
 bindaddr=0.0.0.0	; Address to bind to
 bindport=2000		; Port to bind to, default tcp/2000
-dateformat=M-D-Y	; M,D,Y in any order (5 chars max)
+dateformat=M-D-Y	; M,D,Y in any order (6 chars max)
+			; "A" may also be used, but it must be at the end.
+			; Use M for month, D for day, Y for year, A for 12-hour time.
 keepalive=120
 
 ;vmexten=8500		; Systemwide voicemailmain pilot number