diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2005-04-08 16:09:26 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2005-04-08 16:09:26 +0000 |
| commit | e13cc2d80520205675bd2af774ba409cbc0359e0 (patch) | |
| tree | bdac9fcd2a8fe294cfb9f3d941834ba6998c4802 /sbin/isakmpd/util.c | |
| parent | d684b8832a75f3b2a437bd8a26e0867cedec1665 (diff) | |
kill USE_OLD_SOCKADDR
Diffstat (limited to 'sbin/isakmpd/util.c')
| -rw-r--r-- | sbin/isakmpd/util.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sbin/isakmpd/util.c b/sbin/isakmpd/util.c index 4b8c40951bc..6168b22b271 100644 --- a/sbin/isakmpd/util.c +++ b/sbin/isakmpd/util.c @@ -1,4 +1,4 @@ -/* $OpenBSD: util.c,v 1.53 2005/04/04 19:31:11 deraadt Exp $ */ +/* $OpenBSD: util.c,v 1.54 2005/04/08 16:09:25 deraadt Exp $ */ /* $EOM: util.c,v 1.23 2000/11/23 12:22:08 niklas Exp $ */ /* @@ -544,7 +544,7 @@ util_ntoa(char **buf, int af, u_int8_t *addr) bzero(&from, fromlen); sfrom->sa_family = af; -#ifndef USE_OLD_SOCKADDR + switch (af) { case AF_INET: sfrom->sa_len = sizeof(struct sockaddr_in); @@ -553,7 +553,7 @@ util_ntoa(char **buf, int af, u_int8_t *addr) sfrom->sa_len = sizeof(struct sockaddr_in6); break; } -#endif + memcpy(sockaddr_addrdata(sfrom), addr, sockaddr_addrlen(sfrom)); if (sockaddr2text(sfrom, buf, 0)) { |