summaryrefslogtreecommitdiff
path: root/sbin
diff options
context:
space:
mode:
authorHakan Olsson <ho@cvs.openbsd.org>2002-01-03 09:24:03 +0000
committerHakan Olsson <ho@cvs.openbsd.org>2002-01-03 09:24:03 +0000
commitf1b80958feeca33866c6485f0e0503551c685713 (patch)
tree596bfc48f96460b811b91a72613cc5c374d32eaf /sbin
parentb73ad98ab184d778427b6f5e603fb9df18878950 (diff)
strftime format fixes. From Christo Butcher <christo@fox-it.com>.
Diffstat (limited to 'sbin')
-rw-r--r--sbin/isakmpd/policy.c6
-rw-r--r--sbin/isakmpd/x509.c6
2 files changed, 6 insertions, 6 deletions
diff --git a/sbin/isakmpd/policy.c b/sbin/isakmpd/policy.c
index fb490b6c041..10eae078e02 100644
--- a/sbin/isakmpd/policy.c
+++ b/sbin/isakmpd/policy.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: policy.c,v 1.46 2001/08/26 01:48:12 niklas Exp $ */
+/* $OpenBSD: policy.c,v 1.47 2002/01/03 09:24:02 ho Exp $ */
/* $EOM: policy.c,v 1.49 2000/10/24 13:33:39 niklas Exp $ */
/*
@@ -1655,14 +1655,14 @@ policy_callback (char *name)
if (strcmp (name, "GMTTimeOfDay") == 0)
{
tt = time ((time_t) NULL);
- strftime (mytimeofday, 14, "%G%m%d%H%M%S", gmtime (&tt));
+ strftime (mytimeofday, 14, "%Y%m%d%H%M%S", gmtime (&tt));
return mytimeofday;
}
if (strcmp (name, "LocalTimeOfDay") == 0)
{
tt = time ((time_t) NULL);
- strftime (mytimeofday, 14, "%G%m%d%H%M%S", localtime (&tt));
+ strftime (mytimeofday, 14, "%Y%m%d%H%M%S", localtime (&tt));
return mytimeofday;
}
diff --git a/sbin/isakmpd/x509.c b/sbin/isakmpd/x509.c
index dec99c32404..44b8dfe5e48 100644
--- a/sbin/isakmpd/x509.c
+++ b/sbin/isakmpd/x509.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: x509.c,v 1.65 2001/08/25 22:17:13 niklas Exp $ */
+/* $OpenBSD: x509.c,v 1.66 2002/01/03 09:24:02 ho Exp $ */
/* $EOM: x509.c,v 1.54 2001/01/16 18:42:16 ho Exp $ */
/*
@@ -239,7 +239,7 @@ x509_generate_kn (int id, X509 *cert)
(tm->type != V_ASN1_UTCTIME && tm->type != V_ASN1_GENERALIZEDTIME))
{
tt = time (0);
- strftime (before, 14, "%G%m%d%H%M%S", localtime (&tt));
+ strftime (before, 14, "%Y%m%d%H%M%S", localtime (&tt));
timecomp = "LocalTimeOfDay";
}
else
@@ -355,7 +355,7 @@ x509_generate_kn (int id, X509 *cert)
&& (tm->type != V_ASN1_UTCTIME && tm->type != V_ASN1_GENERALIZEDTIME))
{
tt = time (0);
- strftime (after, 14, "%G%m%d%H%M%S", localtime (&tt));
+ strftime (after, 14, "%Y%m%d%H%M%S", localtime (&tt));
timecomp2 = "LocalTimeOfDay";
}
else