From 44d3eb258cc9fbad0112f8457e7e9306272feaf3 Mon Sep 17 00:00:00 2001 From: "net[shemminger]!shemminger" Date: Thu, 7 Oct 2004 18:55:51 +0000 Subject: [PATCH] Import patch iproute2-compile-fixes-1.diff (Logical change 1.93) --- Makefile | 1 + ip/ipxfrm.c | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index fa820db3..c4a6f653 100644 --- a/Makefile +++ b/Makefile @@ -59,5 +59,6 @@ clean: clobber: clean rm -f Config +distclean: clean clobber .EXPORT_ALL_VARIABLES: diff --git a/ip/ipxfrm.c b/ip/ipxfrm.c index b6228c97..4df3fb99 100644 --- a/ip/ipxfrm.c +++ b/ip/ipxfrm.c @@ -280,7 +280,7 @@ static const char *strxf_time(__u64 time) t = (long)time; tp = localtime(&t); - strftime(str, sizeof(str), "%F %T", tp); + strftime(str, sizeof(str), "%Y-%m-%d %T", tp); } return str; @@ -410,7 +410,7 @@ void xfrm_selector_print(struct xfrm_selector *sel, __u16 family, } if (sel->ifindex > 0) { - char buf[IF_NAMESIZE]; + char buf[IFNAMSIZ]; memset(buf, '\0', sizeof(buf)); if_indextoname(sel->ifindex, buf);