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.

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@77997 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Jason Parker
2007-08-02 21:54:54 +00:00
parent fb94195d90
commit 1064b75ab7
2 changed files with 5 additions and 3 deletions

View File

@@ -3198,7 +3198,7 @@ static int handle_register_message(struct skinny_req *req, struct skinnysession
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 @@ static int reload_config(void)
}
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")) {