From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Mon, 30 Sep 2013 16:06:24 +0000 (+0100)
Subject: Allow parsing uint32 as time values.
X-Git-Tag: 0.6.0~152
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fe4b87bc2dc20eff0fa0083e23ebaa9ba10727ce;p=thirdparty%2Frspamd.git

Allow parsing uint32 as time values.
---

diff --git a/src/cfg_rcl.c b/src/cfg_rcl.c
index 15f5b7e9ad..bf1b8ad700 100644
--- a/src/cfg_rcl.c
+++ b/src/cfg_rcl.c
@@ -809,6 +809,7 @@ rspamd_rcl_parse_struct_time (struct config_file *cfg, rspamd_cl_object_t *obj,
 	struct rspamd_rcl_struct_parser *pd = ud;
 	union {
 		gint *psec;
+		guint32 *pu32;
 		gdouble *pdv;
 		struct timeval *ptv;
 		struct timespec *pts;
@@ -838,6 +839,10 @@ rspamd_rcl_parse_struct_time (struct config_file *cfg, rspamd_cl_object_t *obj,
 		target.psec = (gint *)(((gchar *)pd->user_struct) + pd->offset);
 		*target.psec = val * 1000;
 	}
+	else if (pd->flags == RSPAMD_CL_FLAG_TIME_UINT_32) {
+		target.pu32 = (guint32 *)(((gchar *)pd->user_struct) + pd->offset);
+		*target.pu32 = val * 1000;
+	}
 	else {
 		g_set_error (err, CFG_RCL_ERROR, EINVAL, "invalid flags to parse time value");
 		return FALSE;
diff --git a/src/cfg_rcl.h b/src/cfg_rcl.h
index 1b19783cf6..fb0fea7e3a 100644
--- a/src/cfg_rcl.h
+++ b/src/cfg_rcl.h
@@ -45,10 +45,11 @@ struct rspamd_rcl_struct_parser {
 		RSPAMD_CL_FLAG_TIME_TIMEVAL = 0x1 << 1,
 		RSPAMD_CL_FLAG_TIME_TIMESPEC = 0x1 << 2,
 		RSPAMD_CL_FLAG_TIME_INTEGER = 0x1 << 3,
-		RSPAMD_CL_FLAG_INT_16 = 0x1 << 4,
-		RSPAMD_CL_FLAG_INT_32 = 0x1 << 5,
-		RSPAMD_CL_FLAG_INT_64 = 0x1 << 6,
-		RSPAMD_CL_FLAG_INT_SIZE = 0x1 << 7
+		RSPAMD_CL_FLAG_TIME_UINT_32 = 0x1 << 4,
+		RSPAMD_CL_FLAG_INT_16 = 0x1 << 5,
+		RSPAMD_CL_FLAG_INT_32 = 0x1 << 6,
+		RSPAMD_CL_FLAG_INT_64 = 0x1 << 7,
+		RSPAMD_CL_FLAG_INT_SIZE = 0x1 << 8
 	} flags;
 };