Force ast_mktime() to check for DST, since strptime(3) does not.

(Closes issue #12374)

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

diff --git a/funcs/func_strings.c b/funcs/func_strings.c
index b01bec7124d844d6ec796bc8c2473abee0ddac3f..10c274efd89cf3b67facefc64431c0c14efbdc99 100644 (file)
--- a/funcs/func_strings.c
+++ b/funcs/func_strings.c
@@ -499,6 +499,8 @@ static int acf_strptime(struct ast_channel *chan, char *cmd, char *data,
        if (!strptime(args.timestring, args.format, &time)) {
                ast_log(LOG_WARNING, "C function strptime() output nothing?!!\n");
        } else {
+               /* Since strptime(3) does not check DST, force ast_mktime() to calculate it. */
+               time.tm_isdst = -1;
                snprintf(buf, len, "%d", (int) ast_mktime(&time, args.timezone));
        }