diff options
| author |   tholo <tholo@openbsd.org> | 2001-03-14 21:13:24 +0000 |
|---|---|---|
| committer | tholo <tholo@openbsd.org> | 2001-03-14 21:13:24 +0000 |
| commit | d317b4b1f5b53e670f1e217eec535274fc8113fd (patch) | |
| tree | 4900af91b018d96eb8b1ac63af7c3bb48ce1715e | |
| parent | Follow openbsd model for multicast ioctl handling (diff) | |
| download | wireguard-openbsd-d317b4b1f5b53e670f1e217eec535274fc8113fd.tar.xz wireguard-openbsd-d317b4b1f5b53e670f1e217eec535274fc8113fd.zip | |
Make these compile again...
| -rw-r--r-- | sbin/isakmpd/connection.c | 6 | ||||
| -rw-r--r-- | sbin/isakmpd/policy.c | 4 | ||||
| -rw-r--r-- | sbin/isakmpd/x509.c | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/sbin/isakmpd/connection.c b/sbin/isakmpd/connection.c index 2f6a2f10cb5..629dd41bb52 100644 --- a/sbin/isakmpd/connection.c +++ b/sbin/isakmpd/connection.c @@ -1,4 +1,4 @@ -/* $OpenBSD: connection.c,v 1.16 2001/03/14 12:15:45 niklas Exp $ */ +/* $OpenBSD: connection.c,v 1.17 2001/03/14 21:13:24 tholo Exp $ */ /* $EOM: connection.c,v 1.28 2000/11/23 12:21:18 niklas Exp $ */ /* @@ -462,13 +462,13 @@ connection_reinit (void) /* Remove all present connections. */ for (conn = TAILQ_FIRST (&connections); conn; conn = next) { - next = TAILQ_NEXT (conn); + next = TAILQ_NEXT (conn, link); connection_teardown (conn->name); } for (pconn = TAILQ_FIRST (&connections_passive); pconn; pconn = pnext) { - pnext = TAILQ_NEXT (pconn); + pnext = TAILQ_NEXT (pconn, link); connection_passive_teardown (pconn->name); } diff --git a/sbin/isakmpd/policy.c b/sbin/isakmpd/policy.c index 3dde6fba2e3..f84b1432415 100644 --- a/sbin/isakmpd/policy.c +++ b/sbin/isakmpd/policy.c @@ -1,4 +1,4 @@ -/* $OpenBSD: policy.c,v 1.25 2001/03/14 12:15:45 niklas Exp $ */ +/* $OpenBSD: policy.c,v 1.26 2001/03/14 21:13:24 tholo Exp $ */ /* $EOM: policy.c,v 1.49 2000/10/24 13:33:39 niklas Exp $ */ /* @@ -1690,7 +1690,7 @@ keynote_certreq_validate (u_int8_t *data, u_int32_t len) if (!dat) { log_error ("keynote_certreq_validate: calloc (%d, %d) failed", len + 1, - sizeof (char)) + sizeof (char)); return 0; } diff --git a/sbin/isakmpd/x509.c b/sbin/isakmpd/x509.c index 7925a03d2a7..12f4ef3bf83 100644 --- a/sbin/isakmpd/x509.c +++ b/sbin/isakmpd/x509.c @@ -1,4 +1,4 @@ -/* $OpenBSD: x509.c,v 1.44 2001/03/14 12:15:46 niklas Exp $ */ +/* $OpenBSD: x509.c,v 1.45 2001/03/14 21:13:24 tholo Exp $ */ /* $EOM: x509.c,v 1.54 2001/01/16 18:42:16 ho Exp $ */ /* @@ -346,7 +346,7 @@ x509_generate_kn (X509 *cert) } tm = X509_get_notAfter (cert); - if (tm == NULL) + if (tm == NULL && (tm->type != V_ASN1_UTCTIME && tm->type != V_ASN1_GENERALIZEDTIME)) { tt = time (0); |