diff options
| author |   gilles <gilles.chehade@gmail.com> | 2014-01-20 16:13:03 +0100 |
|---|---|---|
| committer | gilles <gilles.chehade@gmail.com> | 2014-01-20 16:13:03 +0100 |
| commit | 938312aebbf4ee4a98bf7f101e3591f8cbd71b14 (patch) | |
| tree | 0f6adfbdade892a384c6a34534ff5ab974d149ab /smtpd/parser.c | |
| parent | Merge branch 'master' into portable (diff) | |
| download | OpenSMTPD-938312aebbf4ee4a98bf7f101e3591f8cbd71b14.tar.xz OpenSMTPD-938312aebbf4ee4a98bf7f101e3591f8cbd71b14.zip | |
unbreak build on Linuxopensmtpd-201401201614p1
Diffstat (limited to 'smtpd/parser.c')
| -rw-r--r-- | smtpd/parser.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/smtpd/parser.c b/smtpd/parser.c index 3c0a45e3..5e854e06 100644 --- a/smtpd/parser.c +++ b/smtpd/parser.c @@ -297,7 +297,9 @@ text_to_sockaddr(struct sockaddr *sa, int family, const char *str) sin = (struct sockaddr_in *)sa; memset(sin, 0, sizeof *sin); +#ifdef HAVE_STRUCT_SOCKADDR_IN_SIN_LEN sin->sin_len = sizeof(struct sockaddr_in); +#endif sin->sin_family = PF_INET; sin->sin_addr.s_addr = ina.s_addr; return (0); @@ -320,7 +322,9 @@ text_to_sockaddr(struct sockaddr *sa, int family, const char *str) sin6 = (struct sockaddr_in6 *)sa; memset(sin6, 0, sizeof *sin6); +#ifdef HAVE_STRUCT_SOCKADDR_IN6_SIN6_LEN sin6->sin6_len = sizeof(struct sockaddr_in6); +#endif sin6->sin6_family = PF_INET6; sin6->sin6_addr = in6a; @@ -329,7 +333,7 @@ text_to_sockaddr(struct sockaddr *sa, int family, const char *str) if (IN6_IS_ADDR_LINKLOCAL(&in6a) || IN6_IS_ADDR_MC_LINKLOCAL(&in6a) || - IN6_IS_ADDR_MC_INTFACELOCAL(&in6a)) + IN6_IS_ADDR_MC_NODELOCAL(&in6a)) if ((sin6->sin6_scope_id = if_nametoindex(cp))) return (0); |