output: XML: display time for NFACCT

<obj><name>test</name><pkts>00000000000000000000</pkts><bytes>00000000000000000000</bytes><hour>17</hour><min>46</min><sec>47</sec><wday>6</wday><day>22</day><month>6</month><year>2012</year></obj>

Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

diff --git a/configure.ac b/configure.ac
index e8a31ca20622110ce4f2474e16fc93dc4f627ecd..16b4bd240331ee7d49e5fefa779f286a6f056a79 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -44,7 +44,7 @@ AC_SUBST([regular_CFLAGS])
 dnl Check for the right nfnetlink version
 PKG_CHECK_MODULES([LIBNFNETLINK], [libnfnetlink >= 1.0.0])
 PKG_CHECK_MODULES([LIBMNL], [libmnl >= 1.0.0])
-PKG_CHECK_MODULES([LIBNETFILTER_ACCT], [libnetfilter_acct >= 1.0.0])
+PKG_CHECK_MODULES([LIBNETFILTER_ACCT], [libnetfilter_acct >= 1.0.1])
 PKG_CHECK_MODULES([LIBNETFILTER_CONNTRACK], [libnetfilter_conntrack >= 1.0.0])
 PKG_CHECK_MODULES([LIBNETFILTER_LOG], [libnetfilter_log >= 1.0.0])
 

diff --git a/output/ulogd_output_XML.c b/output/ulogd_output_XML.c
index 5215e28286e8f7a5a195c5bbd8e1c8027ea1fee6..2008772f8bda7ebb81519a70e8da1ce181bb4ef6 100644 (file)
--- a/output/ulogd_output_XML.c
+++ b/output/ulogd_output_XML.c
@@ -121,7 +121,8 @@ xml_output_sum(struct ulogd_key *inp, char *buf, ssize_t size)
        struct nfacct *nfacct = ikey_get_ptr(&inp[KEY_SUM]);
        int tmp;
 
-       tmp = nfacct_snprintf(buf, size, nfacct, NFACCT_SNPRINTF_T_XML, 0);
+       tmp = nfacct_snprintf(buf, size, nfacct, NFACCT_SNPRINTF_T_XML,
+                                                NFACCT_SNPRINTF_F_TIME);
        if (tmp < 0 || tmp >= size)
                return -1;