SecBSD/src
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

sync with OpenBSD -current

Browse source
This commit is contained in:
purplerain 2024-01-05 00:18:10 +00:00
parent eff43bb1fd
commit a2b5593ce1
Signed by: purplerain
GPG key ID: F42C07F07E2E35B7
76 changed files with 1704 additions and 1876 deletions
Download patch file Download diff file Expand all files Collapse all files

31
usr.sbin/smtpd/table.c
View file

@ -1,4 +1,4 @@
/* $OpenBSD: table.c,v 1.50 2021/06/14 17:58:16 eric Exp $ */
/* $OpenBSD: table.c,v 1.51 2024/01/04 09:34:03 op Exp $ */
/*
* Copyright (c) 2013 Eric Faurot <eric@openbsd.org>
@ -628,7 +628,8 @@ parse_sockaddr(struct sockaddr *sa, int family, const char *str)
struct in6_addr in6a;
struct sockaddr_in *sin;
struct sockaddr_in6 *sin6;
char *cp, *str2;
char *cp;
char addr[NI_MAXHOST];
const char *errstr;
switch (family) {
@ -649,21 +650,19 @@ parse_sockaddr(struct sockaddr *sa, int family, const char *str)
return (0);
case PF_INET6:
if (strncasecmp("ipv6:", str, 5) == 0)
if (*str == '[')
str++;
if (!strncasecmp("ipv6:", str, 5))
str += 5;
cp = strchr(str, SCOPE_DELIMITER);
if (cp) {
str2 = strdup(str);
if (str2 == NULL)
return (-1);
str2[cp - str] = '\0';
if (inet_pton(PF_INET6, str2, &in6a) != 1) {
free(str2);
return (-1);
}
cp++;
free(str2);
} else if (inet_pton(PF_INET6, str, &in6a) != 1)
if (strlcpy(addr, str, sizeof(addr)) >= sizeof(addr))
return (-1);
if ((cp = strchr(addr, ']')) != NULL)
*cp = '\0';
if ((cp = strchr(addr, SCOPE_DELIMITER)) != NULL)
*cp++ = '\0';
if (inet_pton(PF_INET6, addr, &in6a) != 1)
return (-1);
sin6 = (struct sockaddr_in6 *)sa;