1 diff -Nur snapshot-20011127.orig/makedefs snapshot-20011127/makedefs
2 --- snapshot-20011127.orig/makedefs Wed Nov 21 22:40:39 2001
3 +++ snapshot-20011127/makedefs Mon Dec 3 14:16:38 2001
5 SYSTEM=`(uname -s) 2>/dev/null`
6 RELEASE=`(uname -r) 2>/dev/null`
7 VERSION=`(uname -v) 2>/dev/null`
8 +if test -f /usr/include/netinet6/in6.h; then
9 + grep __KAME__ /usr/include/netinet6/in6.h 2>&1 >/dev/null
13 + if [ -f /usr/local/v6/lib/libinet6.a ]; then
20 +if [ -z "$INET6" -a -f /usr/include/netinet/ip6.h -a -f /usr/include/linux/icmpv6.h ]; then
25 dcosx*) SYSTEM=$VERSION;;
29 : ${CC='gcc $(WARN)'} ${OPT='-O'} ${DEBUG='-g'} ${AWK=awk}
33 + CCARGS="$CCARGS -DINET6 -D__ss_family=ss_family -D__ss_len=ss_len"
34 + if test -f /usr/local/v6/lib/libinet6.a; then
35 + SYSLIBS="$SYSLIBS -L/usr/local/v6/lib -linet6"
39 + CCARGS="$CCARGS -DINET6 -D__ss_family=ss_family -D__ss_len=ss_len"
42 + CCARGS="$CCARGS -DINET6 -D__ss_family=ss_family"
43 + if test -f /usr/include/libinet6/netinet/ip6.h -a \
44 + -f /usr/lib/libinet6.a; then
45 + CCARGS="$CCARGS -I/usr/include/libinet6 -DUSAGI_LIBINET6"
46 + SYSLIBS="$SYSLIBS -linet6"
51 export SYSTYPE AR ARFL RANLIB SYSLIBS CC OPT DEBUG AWK OPTS
53 diff -Nur snapshot-20011127.orig/src/dns/dns_lookup.c snapshot-20011127/src/dns/dns_lookup.c
54 --- snapshot-20011127.orig/src/dns/dns_lookup.c Sun Feb 4 19:16:20 2001
55 +++ snapshot-20011127/src/dns/dns_lookup.c Mon Dec 3 14:16:39 2001
59 #define INET_ADDR_LEN 4 /* XXX */
61 +#define INET6_ADDR_LEN 16
64 /* dns_query - query name server and pre-parse the reply */
67 memcpy(temp, pos, fixed->length);
68 data_len = fixed->length;
72 + if (fixed->length != INET6_ADDR_LEN) {
73 + msg_warn("extract_answer: bad IPv6 address length: %d", fixed->length);
76 + if (fixed->length > sizeof(temp))
77 + msg_panic("dns_get_rr: length %d > DNS_NAME_LEN",
79 + memcpy(temp, pos, fixed->length);
80 + data_len = fixed->length;
84 data_len = MIN2(pos[0] + 1, MIN2(fixed->length + 1, sizeof(temp)));
85 for (src = pos + 1, dst = (unsigned char *) (temp);
86 diff -Nur snapshot-20011127.orig/src/global/Makefile.in snapshot-20011127/src/global/Makefile.in
87 --- snapshot-20011127.orig/src/global/Makefile.in Mon Dec 3 14:15:12 2001
88 +++ snapshot-20011127/src/global/Makefile.in Mon Dec 3 14:16:39 2001
90 timed_ipc.c tok822_find.c tok822_node.c tok822_parse.c \
91 tok822_resolve.c tok822_rewrite.c tok822_tree.c xtext.c bounce_log.c \
92 flush_clnt.c mail_conf_time.c mbox_conf.c mbox_open.c abounce.c \
93 - verp_sender.c match_parent_style.c pfixtls.c
94 + verp_sender.c match_parent_style.c pfixtls.c wildcard_inet_addr.c
95 OBJS = been_here.o bounce.o canon_addr.o cleanup_strerror.o clnt_stream.o \
96 debug_peer.o debug_process.o defer.o deliver_completed.o \
97 deliver_flock.o deliver_pass.o deliver_request.o domain_list.o \
99 timed_ipc.o tok822_find.o tok822_node.o tok822_parse.o \
100 tok822_resolve.o tok822_rewrite.o tok822_tree.o xtext.o bounce_log.o \
101 flush_clnt.o mail_conf_time.o mbox_conf.o mbox_open.o abounce.o \
102 - verp_sender.o match_parent_style.o pfixtls.o
103 + verp_sender.o match_parent_style.o pfixtls.o wildcard_inet_addr.o
104 HDRS = been_here.h bounce.h canon_addr.h cleanup_user.h clnt_stream.h \
105 config.h debug_peer.h debug_process.h defer.h deliver_completed.h \
106 deliver_flock.h deliver_pass.h deliver_request.h domain_list.h \
108 rewrite_clnt.h sent.h smtp_stream.h split_addr.h string_list.h \
109 sys_exits.h timed_ipc.h tok822.h xtext.h bounce_log.h flush_clnt.h \
110 mbox_conf.h mbox_open.h abounce.h qmqp_proto.h verp_sender.h \
111 - match_parent_style.h pfixtls.h
112 + match_parent_style.h pfixtls.h wildcard_inet_addr.h
113 TESTSRC = rec2stream.c stream2rec.c recdump.c
114 WARN = -W -Wformat -Wimplicit -Wmissing-prototypes \
115 -Wparentheses -Wstrict-prototypes -Wswitch -Wuninitialized \
116 diff -Nur snapshot-20011127.orig/src/global/mynetworks.c snapshot-20011127/src/global/mynetworks.c
117 --- snapshot-20011127.orig/src/global/mynetworks.c Sun Feb 25 02:46:07 2001
118 +++ snapshot-20011127/src/global/mynetworks.c Mon Dec 3 14:16:39 2001
121 #include <inet_addr_list.h>
122 #include <name_mask.h>
124 +#include <sys/socket.h>
125 +#include <netinet/in.h>
129 /* Global library. */
132 const char *mynetworks(void)
134 static VSTRING *result;
136 + char hbuf[NI_MAXHOST];
140 char *myname = "mynetworks";
146 + struct sockaddr *sa;
149 mask_style = name_mask("mynetworks mask style", mask_styles,
150 var_mynetworks_style);
152 my_mask_list = own_inet_mask_list();
154 for (i = 0; i < my_addr_list->used; i++) {
156 + sa = (struct sockaddr *)&my_addr_list->addrs[i];
157 + if (sa->sa_family != AF_INET) {
158 + vstring_sprintf_append(result, "XAATODOmynetworks ");
161 + addr = ntohl(((struct sockaddr_in *)sa)->sin_addr.s_addr);
162 + mask = ntohl(((struct sockaddr_in *)&my_mask_list->addrs[i])->sin_addr.s_addr);
164 addr = ntohl(my_addr_list->addrs[i].s_addr);
165 mask = ntohl(my_mask_list->addrs[i].s_addr);
168 switch (mask_style) {
171 mask = IN_CLASSD_NET;
172 shift = IN_CLASSD_NSHIFT;
175 + if (getnameinfo(sa, SA_LEN(sa), hbuf, sizeof(hbuf), NULL, 0,
177 + strncpy(hbuf, "???", sizeof(hbuf));
178 + msg_fatal("%s: bad address class: %s", myname, hbuf);
180 msg_fatal("%s: bad address class: %s",
181 myname, inet_ntoa(my_addr_list->addrs[i]));
186 diff -Nur snapshot-20011127.orig/src/global/own_inet_addr.c snapshot-20011127/src/global/own_inet_addr.c
187 --- snapshot-20011127.orig/src/global/own_inet_addr.c Tue Jul 31 20:38:29 2001
188 +++ snapshot-20011127/src/global/own_inet_addr.c Mon Dec 3 14:16:39 2001
190 #include <netinet/in.h>
191 #include <arpa/inet.h>
194 +#include <sys/socket.h>
198 #ifdef STRCASECMP_IN_STRINGS_H
200 @@ -101,10 +105,11 @@
203 bufp = hosts = mystrdup(var_inet_interfaces);
204 - while ((host = mystrtok(&bufp, sep)) != 0)
205 + while ((host = mystrtok(&bufp, sep)) != 0) {
206 if (inet_addr_host(addr_list, host) == 0)
207 msg_fatal("config variable %s: host not found: %s",
208 VAR_INET_INTERFACES, host);
213 @@ -121,15 +126,39 @@
214 msg_fatal("could not find any active network interfaces");
215 for (nvirtual = 0; nvirtual < addr_list->used; nvirtual++) {
216 for (nlocal = 0; /* see below */ ; nlocal++) {
217 - if (nlocal >= local_addrs.used)
218 + if (nlocal >= local_addrs.used) {
220 + char hbuf[NI_MAXHOST];
221 + if (getnameinfo((struct sockaddr *)&addr_list->addrs[nvirtual],
222 + SS_LEN(addr_list->addrs[nvirtual]), hbuf,
223 + sizeof(hbuf), NULL, 0, NI_NUMERICHOST) != 0)
224 + strncpy(hbuf, "???", sizeof(hbuf));
225 + msg_fatal("parameter %s: no local interface found for %s",
226 + VAR_INET_INTERFACES, hbuf);
228 msg_fatal("parameter %s: no local interface found for %s",
230 inet_ntoa(addr_list->addrs[nvirtual]));
234 + if (addr_list->addrs[nvirtual].ss_family ==
235 + local_addrs.addrs[nlocal].ss_family &&
236 + SS_LEN(addr_list->addrs[nvirtual]) ==
237 + SS_LEN(local_addrs.addrs[nlocal]) &&
238 + memcmp(&addr_list->addrs[nvirtual],
239 + &local_addrs.addrs[nlocal],
240 + SS_LEN(local_addrs.addrs[nlocal])) == 0) {
241 + inet_addr_list_append(mask_list, (struct sockaddr *)&local_masks.addrs[nlocal]);
245 if (addr_list->addrs[nvirtual].s_addr
246 == local_addrs.addrs[nlocal].s_addr) {
247 inet_addr_list_append(mask_list, &local_masks.addrs[nlocal]);
253 inet_addr_list_free(&local_addrs);
256 /* own_inet_addr - is this my own internet address */
259 +int own_inet_addr(struct sockaddr * addr)
264 + struct sockaddr *sa;
266 + if (addr_list.used == 0)
267 + own_inet_addr_init(&addr_list, &mask_list);
269 + for (i = 0; i < addr_list.used; i++) {
270 + sa = (struct sockaddr *)&addr_list.addrs[i];
271 + if (addr->sa_family != sa->sa_family)
273 + switch (addr->sa_family) {
275 + p = (char *)&((struct sockaddr_in *)addr)->sin_addr;
276 + q = (char *)&((struct sockaddr_in *)&addr_list.addrs[i])->sin_addr;
277 + l = sizeof(struct in_addr);
281 + p = (char *)&((struct sockaddr_in6 *)addr)->sin6_addr;
282 + q = (char *)&((struct sockaddr_in6 *)&addr_list.addrs[i])->sin6_addr;
283 + l = sizeof(struct in6_addr);
288 + if (memcmp(p, q, l) == 0)
294 int own_inet_addr(struct in_addr * addr)
298 for (i = 0; i < addr_list.used; i++)
299 if (addr->s_addr == addr_list.addrs[i].s_addr)
305 /* own_inet_addr_list - return list of addresses */
307 diff -Nur snapshot-20011127.orig/src/global/own_inet_addr.h snapshot-20011127/src/global/own_inet_addr.h
308 --- snapshot-20011127.orig/src/global/own_inet_addr.h Sat Feb 24 02:25:32 2001
309 +++ snapshot-20011127/src/global/own_inet_addr.h Mon Dec 3 14:16:39 2001
313 #include <netinet/in.h>
315 +#include <sys/socket.h>
319 * External interface.
322 +extern int own_inet_addr(struct sockaddr *);
324 extern int own_inet_addr(struct in_addr *);
326 extern struct INET_ADDR_LIST *own_inet_addr_list(void);
327 extern struct INET_ADDR_LIST *own_inet_mask_list(void);
329 diff -Nur snapshot-20011127.orig/src/global/peer_name.c snapshot-20011127/src/global/peer_name.c
330 --- snapshot-20011127.orig/src/global/peer_name.c Sun Jan 28 16:23:02 2001
331 +++ snapshot-20011127/src/global/peer_name.c Mon Dec 3 14:16:39 2001
333 PEER_NAME *peer_name(int sock)
335 static PEER_NAME peer;
336 - struct sockaddr_in sin;
337 - SOCKADDR_SIZE len = sizeof(sin);
344 + struct sockaddr peer_un;
345 + struct sockaddr_in peer_un4;
347 + struct sockaddr_in6 peer_un6;
350 +#define sun p_un.peer_un
351 +#define sin p_un.peer_un4
353 +#define sin6 p_un.peer_un6
354 + static char hbuf[NI_MAXHOST];
355 + static char abuf[NI_MAXHOST];
359 + SOCKADDR_SIZE len = sizeof(p_un);
361 - if (getpeername(sock, (struct sockaddr *) & sin, &len) == 0) {
362 - switch (sin.sin_family) {
363 + if (getpeername(sock, (struct sockaddr *)&p_un, &len) == 0) {
364 + switch (p_un.peer_un.sa_family) {
367 peer.type = PEER_TYPE_INET;
368 hp = gethostbyaddr((char *) &(sin.sin_addr),
370 hp->h_name : "unknown");
371 peer.addr = inet_ntoa(sin.sin_addr);
375 + peer.type = PEER_TYPE_INET;
376 + if (getnameinfo(&sun, len, hbuf, sizeof(hbuf), NULL, 0, NI_NAMEREQD) != 0)
377 + peer.name = "unknown";
383 + peer.type = PEER_TYPE_INET6;
384 + if (getnameinfo(&sun, len, hbuf, sizeof(hbuf), NULL, 0, NI_NAMEREQD) != 0)
385 + peer.name = "unknown";
393 peer.type = PEER_TYPE_LOCAL;
394 diff -Nur snapshot-20011127.orig/src/global/peer_name.h snapshot-20011127/src/global/peer_name.h
395 --- snapshot-20011127.orig/src/global/peer_name.h Fri Dec 11 19:55:32 1998
396 +++ snapshot-20011127/src/global/peer_name.h Mon Dec 3 14:16:39 2001
398 #define PEER_TYPE_UNKNOWN 0
399 #define PEER_TYPE_INET 1
400 #define PEER_TYPE_LOCAL 2
402 +#define PEER_TYPE_INET6 3
405 extern PEER_NAME *peer_name(int);
407 diff -Nur snapshot-20011127.orig/src/global/resolve_local.c snapshot-20011127/src/global/resolve_local.c
408 --- snapshot-20011127.orig/src/global/resolve_local.c Tue Nov 20 22:41:26 2001
409 +++ snapshot-20011127/src/global/resolve_local.c Mon Dec 3 14:16:39 2001
411 #include <netinet/in.h>
412 #include <arpa/inet.h>
417 #define INADDR_NONE 0xffffffff
420 char *saved_addr = mystrdup(addr);
423 + struct addrinfo hints, *res, *res0;
426 struct in_addr ipaddr;
430 #define RETURN(x) { myfree(saved_addr); return(x); }
432 if (*dest == '[' && dest[len - 1] == ']') {
436 + memset(&hints, 0, sizeof(hints));
437 + hints.ai_family = PF_UNSPEC;
438 + hints.ai_socktype = SOCK_DGRAM;
439 + error = getaddrinfo(dest, NULL, &hints, &res0);
441 + for (res = res0; res; res = res->ai_next) {
442 + if (own_inet_addr(res->ai_addr)) {
443 + freeaddrinfo(res0);
447 + freeaddrinfo(res0);
450 if ((ipaddr.s_addr = inet_addr(dest)) != INADDR_NONE
451 && own_inet_addr(&ipaddr))
457 diff -Nur snapshot-20011127.orig/src/global/wildcard_inet_addr.c snapshot-20011127/src/global/wildcard_inet_addr.c
458 --- snapshot-20011127.orig/src/global/wildcard_inet_addr.c Thu Jan 1 01:00:00 1970
459 +++ snapshot-20011127/src/global/wildcard_inet_addr.c Mon Dec 3 14:16:39 2001
461 +/* System library. */
463 +#include <sys_defs.h>
464 +#include <netinet/in.h>
465 +#include <arpa/inet.h>
468 +#include <sys/socket.h>
472 +#ifdef STRCASECMP_IN_STRINGS_H
473 +#include <strings.h>
476 +/* Utility library. */
479 +#include <mymalloc.h>
480 +#include <inet_addr_list.h>
481 +#include <inet_addr_local.h>
482 +#include <inet_addr_host.h>
483 +#include <stringops.h>
485 +/* Global library. */
487 +#include <mail_params.h>
488 +#include <wildcard_inet_addr.h>
490 +/* Application-specific. */
491 +static INET_ADDR_LIST addr_list;
493 +/* wildcard_inet_addr_init - initialize my own address list */
495 +static void wildcard_inet_addr_init(INET_ADDR_LIST *addr_list)
498 + struct addrinfo hints, *res, *res0;
499 + char hbuf[NI_MAXHOST];
501 +#ifdef NI_WITHSCOPEID
502 + const int niflags = NI_NUMERICHOST | NI_WITHSCOPEID;
504 + const int niflags = NI_NUMERICHOST;
507 + inet_addr_list_init(addr_list);
509 + memset(&hints, 0, sizeof(hints));
510 + hints.ai_family = PF_UNSPEC;
511 + hints.ai_socktype = SOCK_STREAM;
512 + hints.ai_flags = AI_PASSIVE;
513 + error = getaddrinfo(NULL, "0", &hints, &res0);
515 + msg_fatal("could not get list of wildcard addresses");
516 + for (res = res0; res; res = res->ai_next) {
517 + if (res->ai_family != AF_INET && res->ai_family != AF_INET6)
519 + if (getnameinfo(res->ai_addr, res->ai_addrlen, hbuf, sizeof(hbuf),
520 + NULL, 0, niflags) != 0)
522 + if (inet_addr_host(addr_list, hbuf) == 0)
523 + continue; /* msg_fatal("config variable %s: host not found: %s",
524 + VAR_INET_INTERFACES, hbuf); */
526 + freeaddrinfo(res0);
528 + if (inet_addr_host(addr_list, "0.0.0.0") == 0)
529 + msg_fatal("config variable %s: host not found: %s",
530 + VAR_INET_INTERFACES, "0.0.0.0");
534 +/* wildcard_inet_addr_list - return list of addresses */
536 +INET_ADDR_LIST *wildcard_inet_addr_list(void)
538 + if (addr_list.used == 0)
539 + wildcard_inet_addr_init(&addr_list);
541 + return (&addr_list);
543 diff -Nur snapshot-20011127.orig/src/global/wildcard_inet_addr.h snapshot-20011127/src/global/wildcard_inet_addr.h
544 --- snapshot-20011127.orig/src/global/wildcard_inet_addr.h Thu Jan 1 01:00:00 1970
545 +++ snapshot-20011127/src/global/wildcard_inet_addr.h Mon Dec 3 14:16:39 2001
547 +#ifndef _WILDCARD_INET_ADDR_H_INCLUDED_
548 +#define _WILDCARD_INET_ADDR_H_INCLUDED_
552 +/* wildcard_inet_addr_list 3h
554 +/* grab the list of wildcard IP addresses.
556 +/* #include <own_inet_addr.h>
564 +#include <netinet/in.h>
566 +#include <sys/socket.h>
570 + * External interface.
572 +extern struct INET_ADDR_LIST *wildcard_inet_addr_list(void);
579 +/* Jun-ichiro itojun Hagino
583 diff -Nur snapshot-20011127.orig/src/master/master_ent.c snapshot-20011127/src/master/master_ent.c
584 --- snapshot-20011127.orig/src/master/master_ent.c Tue May 1 00:45:54 2001
585 +++ snapshot-20011127/src/master/master_ent.c Mon Dec 3 14:16:39 2001
587 inet_addr_host(MASTER_INET_ADDRLIST(serv), host);
588 serv->listen_fd_count = MASTER_INET_ADDRLIST(serv)->used;
589 } else if (strcasecmp(var_inet_interfaces, DEF_INET_INTERFACES) == 0) {
591 + MASTER_INET_ADDRLIST(serv) = wildcard_inet_addr_list();
592 + serv->listen_fd_count = MASTER_INET_ADDRLIST(serv)->used;
594 MASTER_INET_ADDRLIST(serv) = 0; /* wild-card */
595 serv->listen_fd_count = 1;
598 MASTER_INET_ADDRLIST(serv) = own_inet_addr_list(); /* virtual */
599 serv->listen_fd_count = MASTER_INET_ADDRLIST(serv)->used;
600 diff -Nur snapshot-20011127.orig/src/master/master_listen.c snapshot-20011127/src/master/master_listen.c
601 --- snapshot-20011127.orig/src/master/master_listen.c Tue May 1 00:47:57 2001
602 +++ snapshot-20011127/src/master/master_listen.c Mon Dec 3 14:16:39 2001
612 /* master_listen_init - enable connection requests */
614 void master_listen_init(MASTER_SERV *serv)
616 char *myname = "master_listen_init";
621 + char hbuf[NI_MAXHOST];
622 + SOCKADDR_SIZE salen;
626 * Find out what transport we should use, then create one or more
627 @@ -111,18 +120,31 @@
629 inet_listen(MASTER_INET_PORT(serv),
630 serv->max_proc > var_proc_limit ?
631 - serv->max_proc : var_proc_limit, NON_BLOCKING);
632 + serv->max_proc : var_proc_limit, NON_BLOCKING, 1);
633 close_on_exec(serv->listen_fd[0], CLOSE_ON_EXEC);
634 } else { /* virtual or host:port */
635 - for (n = 0; n < serv->listen_fd_count; n++) {
636 + for (m = n = 0; n < serv->listen_fd_count; n++) {
638 + if (getnameinfo((struct sockaddr *)&MASTER_INET_ADDRLIST(serv)->addrs[n],
639 + SA_LEN((struct sockaddr *)&MASTER_INET_ADDRLIST(serv)->addrs[n]),
640 + hbuf, sizeof(hbuf), NULL, 0, NI_NUMERICHOST)) {
641 + strncpy(hbuf, "?????", sizeof(hbuf));
643 + end_point = concatenate(hbuf, ":", MASTER_INET_PORT(serv), (char *) 0);
645 end_point = concatenate(inet_ntoa(MASTER_INET_ADDRLIST(serv)->addrs[n]),
646 ":", MASTER_INET_PORT(serv), (char *) 0);
650 = inet_listen(end_point, serv->max_proc > var_proc_limit ?
651 - serv->max_proc : var_proc_limit, NON_BLOCKING);
652 - close_on_exec(serv->listen_fd[n], CLOSE_ON_EXEC);
653 + serv->max_proc : var_proc_limit, NON_BLOCKING, 0);
655 + serv->listen_fd[m] = tmpfd;
656 + close_on_exec(serv->listen_fd[m++], CLOSE_ON_EXEC);
660 + serv->listen_fd_count=m;
664 diff -Nur snapshot-20011127.orig/src/qmgr/qmgr_message.c snapshot-20011127/src/qmgr/qmgr_message.c
665 --- snapshot-20011127.orig/src/qmgr/qmgr_message.c Sat Jul 14 15:08:57 2001
666 +++ snapshot-20011127/src/qmgr/qmgr_message.c Mon Dec 3 14:16:39 2001
668 * every front-ent program.
670 if ((at = strrchr(recipient->address, '@')) != 0
672 + && (at + 1)[strspn(at + 1, "[]0123456789.:abcdef")] != 0
674 && (at + 1)[strspn(at + 1, "[]0123456789.")] != 0
676 && valid_hostname(at + 1, DONT_GRIPE) == 0) {
677 qmgr_bounce_recipient(message, recipient,
678 "bad host/domain syntax: \"%s\"", at + 1);
679 diff -Nur snapshot-20011127.orig/src/smtp/Makefile.in snapshot-20011127/src/smtp/Makefile.in
680 --- snapshot-20011127.orig/src/smtp/Makefile.in Mon Dec 3 14:15:13 2001
681 +++ snapshot-20011127/src/smtp/Makefile.in Mon Dec 3 14:16:39 2001
683 smtp_connect.o: ../../include/mail_params.h
684 smtp_connect.o: ../../include/own_inet_addr.h
685 smtp_connect.o: ../../include/dns.h
686 +smtp_connect.o: ../../include/get_port.h
687 smtp_connect.o: smtp.h
688 smtp_connect.o: ../../include/argv.h
689 smtp_connect.o: ../../include/deliver_request.h
690 diff -Nur snapshot-20011127.orig/src/smtp/smtp_addr.c snapshot-20011127/src/smtp/smtp_addr.c
691 --- snapshot-20011127.orig/src/smtp/smtp_addr.c Sun Jul 8 17:05:26 2001
692 +++ snapshot-20011127/src/smtp/smtp_addr.c Mon Dec 3 14:16:39 2001
693 @@ -134,18 +134,68 @@
694 static void smtp_print_addr(char *what, DNS_RR *addr_list)
697 - struct in_addr in_addr;
699 + struct sockaddr_storage ss;
701 + struct sockaddr ss;
703 + struct sockaddr_in *sin;
705 + struct sockaddr_in6 *sin6;
706 + char hbuf[NI_MAXHOST];
708 + char hbuf[sizeof("255.255.255.255") + 1];
711 msg_info("begin %s address list", what);
712 for (addr = addr_list; addr; addr = addr->next) {
713 - if (addr->data_len > sizeof(addr)) {
714 - msg_warn("skipping address length %d", addr->data_len);
716 - memcpy((char *) &in_addr, addr->data, sizeof(in_addr));
717 - msg_info("pref %4d host %s/%s",
718 - addr->pref, addr->name,
719 - inet_ntoa(in_addr));
720 + if (addr->class != C_IN) {
721 + msg_warn("skipping unsupported address (class=%u)", addr->class);
724 + switch (addr->type) {
726 + if (addr->data_len != sizeof(sin->sin_addr)) {
727 + msg_warn("skipping invalid address (AAAA, len=%u)",
731 + sin = (struct sockaddr_in *)&ss;
732 + memset(sin, 0, sizeof(*sin));
733 + sin->sin_family = AF_INET;
735 + sin->sin_len = sizeof(*sin);
737 + memcpy(&sin->sin_addr, addr->data, sizeof(sin->sin_addr));
741 + if (addr->data_len != sizeof(sin6->sin6_addr)) {
742 + msg_warn("skipping invalid address (AAAA, len=%u)",
746 + sin6 = (struct sockaddr_in6 *)&ss;
747 + memset(sin6, 0, sizeof(*sin6));
748 + sin6->sin6_family = AF_INET6;
750 + sin6->sin6_len = sizeof(*sin6);
752 + memcpy(&sin6->sin6_addr, addr->data, sizeof(sin6->sin6_addr));
756 + msg_warn("skipping unsupported address (type=%u)", addr->type);
761 + (void)getnameinfo((struct sockaddr *)&ss, SS_LEN(ss),
762 + hbuf, sizeof(hbuf), NULL, 0, NI_NUMERICHOST);
764 + (void)inet_ntop(AF_INET, &sin->sin_addr, hbuf, sizeof(hbuf));
766 + msg_info("pref %4d host %s/%s", addr->pref, addr->name, hbuf);
768 msg_info("end %s address list", what);
770 @@ -155,15 +205,23 @@
771 static DNS_RR *smtp_addr_one(DNS_RR *addr_list, char *host, unsigned pref, VSTRING *why)
773 char *myname = "smtp_addr_one";
775 struct in_addr inaddr;
781 + struct addrinfo hints, *res0, *res;
789 msg_info("%s: host %s", myname, host);
793 * Interpret a numerical name as an address.
796 smtp_errno = SMTP_FAIL;
800 + memset(&hints, 0, sizeof(hints));
801 + hints.ai_family = PF_UNSPEC;
802 + hints.ai_socktype = SOCK_STREAM;
803 + error = getaddrinfo(host, NULL, &hints, &res0);
807 + smtp_errno = SMTP_RETRY;
810 + vstring_sprintf(why, "[%s]: %s",host,gai_strerror(error));
811 + smtp_errno = SMTP_FAIL;
814 + return (addr_list);
816 + for (res = res0; res; res = res->ai_next) {
817 + memset((char *) &fixed, 0, sizeof(fixed));
818 + switch(res->ai_family) {
820 + /* XXX not scope friendly */
821 + fixed.type = T_AAAA;
822 + addr = (char *)&((struct sockaddr_in6 *)res->ai_addr)->sin6_addr;
823 + addrlen = sizeof(struct in6_addr);
827 + addr = (char *)&((struct sockaddr_in *)res->ai_addr)->sin_addr;
828 + addrlen = sizeof(struct in_addr);
831 + msg_warn("%s: unknown address family %d for %s",
832 + myname, res->ai_family, host);
835 + addr_list = dns_rr_append(addr_list,
836 + dns_rr_create(host, &fixed, pref, addr, addrlen));
839 + freeaddrinfo(res0);
845 INET_ADDR_LIST *self;
849 + struct sockaddr *sa;
853 * Find the first address that lists any address that this mail system is
854 @@ -260,12 +363,36 @@
856 self = own_inet_addr_list();
857 for (addr = addr_list; addr; addr = addr->next) {
858 - for (i = 0; i < self->used; i++)
859 + for (i = 0; i < self->used; i++) {
861 + sa = (struct sockaddr *)&self->addrs[i];
862 + switch(addr->type) {
865 + if (sa->sa_family != AF_INET6)
867 + if (memcmp(&((struct sockaddr_in6 *)sa)->sin6_addr,
868 + addr->data, sizeof(struct in6_addr)) == 0) {
873 + if (sa->sa_family != AF_INET)
875 + if (memcmp(&((struct sockaddr_in *)sa)->sin_addr,
876 + addr->data, sizeof(struct in_addr)) == 0) {
882 if (INADDRP(addr->data)->s_addr == self->addrs[i].s_addr) {
884 msg_info("%s: found at pref %d", myname, addr->pref);
892 diff -Nur snapshot-20011127.orig/src/smtp/smtp_connect.c snapshot-20011127/src/smtp/smtp_connect.c
893 --- snapshot-20011127.orig/src/smtp/smtp_connect.c Mon Dec 3 14:15:13 2001
894 +++ snapshot-20011127/src/smtp/smtp_connect.c Mon Dec 3 14:16:39 2001
896 /* System library. */
898 #include <sys_defs.h>
900 #include <sys/socket.h>
901 #include <netinet/in.h>
902 #include <arpa/inet.h>
904 #include <inet_addr_list.h>
906 #include <timed_connect.h>
907 +#include <get_port.h>
908 #include <stringops.h>
910 /* Global library. */
911 @@ -133,19 +135,45 @@
914 char *myname = "smtp_connect_addr";
915 - struct sockaddr_in sin;
918 + struct sockaddr_storage ss;
920 + struct sockaddr ss;
922 + struct sockaddr *sa;
923 + struct sockaddr_in *sin;
925 + struct sockaddr_in6 *sin6;
927 + SOCKADDR_SIZE salen;
929 + char hbuf[NI_MAXHOST];
931 + char hbuf[sizeof("255.255.255.255") + 1];
934 INET_ADDR_LIST *addr_list;
939 - unsigned long inaddr;
941 + sa = (struct sockaddr *)&ss;
942 + sin = (struct sockaddr_in *)&ss;
944 + sin6 = (struct sockaddr_in6 *)&ss;
950 - if (addr->data_len > sizeof(sin.sin_addr)) {
952 + if (((addr->type==T_A) && (addr->data_len > sizeof(sin->sin_addr))) ||
953 + ((addr->type==T_AAAA) && (addr->data_len > sizeof(sin6->sin6_addr))))
955 + if (addr->data_len > sizeof(sin->sin_addr))
958 msg_warn("%s: skip address with length %d", myname, addr->data_len);
959 smtp_errno = SMTP_RETRY;
961 @@ -154,17 +182,39 @@
965 - memset((char *) &sin, 0, sizeof(sin));
966 - sin.sin_family = AF_INET;
968 - if ((sock = socket(sin.sin_family, SOCK_STREAM, 0)) < 0)
969 - msg_fatal("%s: socket: %m", myname);
971 + switch (addr->type) {
974 + memset(sin6, 0, sizeof(*sin6));
975 + sin6->sin6_family = AF_INET6;
976 + salen = sizeof(*sin6);
979 + default: /* T_A: */
980 + memset(sin, 0, sizeof(*sin));
981 + sin->sin_family = AF_INET;
982 + salen = sizeof(*sin);
986 + sa->sa_len = salen;
988 + if ((sock = socket(sa->sa_family, SOCK_STREAM, 0)) < 0)
989 + msg_warn("%s: socket: %m", myname);
992 * Allow the sysadmin to specify the source address, for example, as "-o
993 * smtp_bind_address=x.x.x.x" in the master.cf file.
995 if (*var_smtp_bind_addr) {
997 + struct sockaddr_in sin;
999 + memset(&sin, 0, sizeof(sin));
1000 + sin.sin_family = AF_INET;
1002 + sin.sin_len = sizeof(sin);
1004 sin.sin_addr.s_addr = inet_addr(var_smtp_bind_addr);
1005 if (sin.sin_addr.s_addr == INADDR_NONE)
1006 msg_fatal("%s: bad %s parameter: %s",
1007 @@ -173,6 +223,25 @@
1008 msg_warn("%s: bind %s: %m", myname, inet_ntoa(sin.sin_addr));
1010 msg_info("%s: bind %s", myname, inet_ntoa(sin.sin_addr));
1012 + char hbufl[NI_MAXHOST];
1013 + struct addrinfo hints, *res;
1015 + memset(&hints, 0, sizeof(hints));
1016 + hints.ai_family = sa->sa_family;
1017 + hints.ai_socktype = SOCK_STREAM;
1018 + hints.ai_flags = AI_PASSIVE|AI_NUMERICHOST;
1019 + snprintf(hbufl, sizeof(hbufl)-1, "%s", var_smtp_bind_addr);
1020 + if (getaddrinfo(hbufl, NULL, &hints, &res) == 0) {
1021 + (void)getnameinfo(res->ai_addr, res->ai_addrlen, hbufl,
1022 + sizeof(hbufl), NULL, 0, NI_NUMERICHOST);
1023 + if (bind(sock, res->ai_addr, res->ai_addrlen) < 0)
1024 + msg_warn("%s: bind %s: %m", myname, hbufl);
1025 + freeaddrinfo(res);
1027 + msg_info("%s: bind %s", myname, hbufl);
1033 @@ -180,8 +249,17 @@
1034 * the mail appears to come from the "right" machine address.
1036 else if ((addr_list = own_inet_addr_list())->used == 1) {
1038 + struct sockaddr_in sin;
1039 + unsigned long inaddr; /*XXX BAD!*/
1041 + memset(&sin, 0, sizeof(sin));
1042 + sin.sin_family = AF_INET;
1044 + sin.sin_len = sizeof(sin);
1046 memcpy((char *) &sin.sin_addr, addr_list->addrs, sizeof(sin.sin_addr));
1047 - inaddr = ntohl(sin.sin_addr.s_addr);
1048 + inaddr = (unsigned long)ntohl(sin.sin_addr.s_addr);
1049 if (!IN_CLASSA(inaddr)
1050 || !(((inaddr & IN_CLASSA_NET) >> IN_CLASSA_NSHIFT) == IN_LOOPBACKNET)) {
1051 if (bind(sock, (struct sockaddr *) & sin, sizeof(sin)) < 0)
1052 @@ -189,30 +267,85 @@
1054 msg_info("%s: bind %s", myname, inet_ntoa(sin.sin_addr));
1057 + char hbufl[NI_MAXHOST];
1058 + struct addrinfo hints, *res = NULL, *loopback = NULL;
1060 + memset(&hints, 0, sizeof(hints));
1061 + hints.ai_family = sa->sa_family;
1062 + hints.ai_socktype = SOCK_STREAM;
1063 + if (getaddrinfo(NULL, "0", &hints, &loopback) != 0)
1067 + * getnameinfo -> getaddrinfo loop is here so that we can
1068 + * get rid of port.
1070 + (void)getnameinfo((struct sockaddr *)addr_list->addrs, SA_LEN((struct sockaddr *)addr_list->addrs),
1071 + hbufl, sizeof(hbufl), NULL, 0, NI_NUMERICHOST);
1072 + hbufl[sizeof(hbufl)-1] = 0;
1073 + memset(&hints, 0, sizeof(hints));
1074 + hints.ai_family = sa->sa_family;
1075 + hints.ai_socktype = SOCK_STREAM;
1076 + hints.ai_flags = AI_PASSIVE|AI_NUMERICHOST;
1077 + if (getaddrinfo(hbufl, NULL, &hints, &res) == 0 &&
1078 + !(res->ai_addrlen == loopback->ai_addrlen &&
1079 + memcmp(res->ai_addr, loopback->ai_addr, res->ai_addrlen) == 0)) {
1080 + if (bind(sock, res->ai_addr, res->ai_addrlen) < 0)
1081 + msg_warn("%s: bind %s: %m", myname, hbufl);
1083 + msg_info("%s: bind %s", myname, hbufl);
1086 + freeaddrinfo(res);
1088 + freeaddrinfo(loopback);
1093 * Connect to the SMTP server.
1095 - sin.sin_port = port;
1096 - memcpy((char *) &sin.sin_addr, addr->data, sizeof(sin.sin_addr));
1097 + switch (addr->type) {
1100 + /* XXX scope unfriendly */
1101 + memset(sin6, 0, sizeof(*sin6));
1102 + sin6->sin6_port = port;
1103 + sin6->sin6_family = AF_INET6;
1104 + salen = sizeof(*sin6);
1105 + memcpy(&sin6->sin6_addr, addr->data, sizeof(sin6->sin6_addr));
1106 + inet_ntop(AF_INET6, &sin6->sin6_addr, hbuf, sizeof(hbuf));
1109 + default: /* T_A */
1110 + memset(sin, 0, sizeof(*sin));
1111 + sin->sin_port = port;
1112 + sin->sin_family = AF_INET;
1113 + salen = sizeof(*sin);
1114 + memcpy(&sin->sin_addr, addr->data, sizeof(sin->sin_addr));
1115 + inet_ntop(AF_INET, &sin->sin_addr, hbuf, sizeof(hbuf));
1119 + sa->sa_len = salen;
1123 msg_info("%s: trying: %s[%s] port %d...",
1124 - myname, addr->name, inet_ntoa(sin.sin_addr), ntohs(port));
1125 + myname, addr->name, hbuf, ntohs(port));
1126 if (var_smtp_conn_tmout > 0) {
1127 non_blocking(sock, NON_BLOCKING);
1128 - conn_stat = timed_connect(sock, (struct sockaddr *) & sin,
1129 - sizeof(sin), var_smtp_conn_tmout);
1130 + conn_stat = timed_connect(sock, sa, salen, var_smtp_conn_tmout);
1131 saved_errno = errno;
1132 non_blocking(sock, BLOCKING);
1133 errno = saved_errno;
1135 - conn_stat = connect(sock, (struct sockaddr *) & sin, sizeof(sin));
1136 + conn_stat = connect(sock, sa, salen);
1138 if (conn_stat < 0) {
1139 vstring_sprintf(why, "connect to %s[%s]: %m",
1140 - addr->name, inet_ntoa(sin.sin_addr));
1141 + addr->name, hbuf);
1142 smtp_errno = SMTP_RETRY;
1146 * Skip this host if it takes no action within some time limit.
1148 if (read_wait(sock, var_smtp_helo_tmout) < 0) {
1149 - vstring_sprintf(why, "connect to %s[%s]: read timeout",
1150 - addr->name, inet_ntoa(sin.sin_addr));
1151 + vstring_sprintf(why, "connect to %s [%s]: read timeout",
1152 + addr->name, hbuf);
1153 smtp_errno = SMTP_RETRY;
1158 stream = vstream_fdopen(sock, O_RDWR);
1159 if ((ch = VSTREAM_GETC(stream)) == VSTREAM_EOF) {
1160 - vstring_sprintf(why, "connect to %s[%s]: server dropped connection",
1161 - addr->name, inet_ntoa(sin.sin_addr));
1162 + vstring_sprintf(why, "connect to %s [%s]: server dropped connection",
1163 + addr->name, hbuf);
1164 smtp_errno = SMTP_RETRY;
1165 vstream_fclose(stream);
1169 if (ch == '4' && var_smtp_skip_4xx_greeting) {
1170 vstring_sprintf(why, "connect to %s[%s]: server refused mail service",
1171 - addr->name, inet_ntoa(sin.sin_addr));
1172 + addr->name, hbuf);
1173 smtp_errno = SMTP_RETRY;
1174 vstream_fclose(stream);
1176 @@ -258,12 +391,12 @@
1178 if (ch == '5' && var_smtp_skip_5xx_greeting) {
1179 vstring_sprintf(why, "connect to %s[%s]: server refused mail service",
1180 - addr->name, inet_ntoa(sin.sin_addr));
1181 + addr->name, hbuf);
1182 smtp_errno = SMTP_RETRY;
1183 vstream_fclose(stream);
1186 - return (smtp_session_alloc(dest, stream, addr->name, inet_ntoa(sin.sin_addr)));
1187 + return (smtp_session_alloc(dest, stream, addr->name, hbuf));
1190 /* smtp_connect_host - direct connection to host */
1192 SMTP_SESSION *session = 0;
1198 * Try each address in the specified order until we find one that works.
1199 * The addresses belong to the same A record, so we have no information
1201 msg_fatal("unknown service: %s/%s", service, protocol);
1202 *portp = sp->s_port;
1208 diff -Nur snapshot-20011127.orig/src/smtp/smtp_unalias.c snapshot-20011127/src/smtp/smtp_unalias.c
1209 --- snapshot-20011127.orig/src/smtp/smtp_unalias.c Thu Sep 28 19:06:09 2000
1210 +++ snapshot-20011127/src/smtp/smtp_unalias.c Mon Dec 3 14:16:39 2001
1212 if ((result = htable_find(cache, name)) == 0) {
1213 fqdn = vstring_alloc(10);
1214 if (dns_lookup_types(name, smtp_unalias_flags, (DNS_RR **) 0,
1215 - fqdn, (VSTRING *) 0, T_MX, T_A, 0) != DNS_OK)
1216 + fqdn, (VSTRING *) 0, T_MX, T_A,
1221 vstring_strcpy(fqdn, name);
1222 htable_enter(cache, name, result = vstring_export(fqdn));
1224 diff -Nur snapshot-20011127.orig/src/smtpd/smtpd_check.c snapshot-20011127/src/smtpd/smtpd_check.c
1225 --- snapshot-20011127.orig/src/smtpd/smtpd_check.c Mon Dec 3 14:15:13 2001
1226 +++ snapshot-20011127/src/smtpd/smtpd_check.c Mon Dec 3 14:16:39 2001
1227 @@ -916,7 +916,11 @@
1228 msg_info("%s: %s", myname, name);
1230 dns_status = dns_lookup_types(name, 0, (DNS_RR **) 0, (VSTRING *) 0,
1231 - (VSTRING *) 0, T_A, T_MX, 0);
1232 + (VSTRING *) 0, T_A, T_MX,
1237 if (dns_status != DNS_OK)
1238 return (smtpd_check_reject(state, MAIL_ERROR_POLICY,
1239 "%d <%s>: %s odrzucony/rejected: Host not found",
1240 @@ -938,7 +942,11 @@
1241 msg_info("%s: %s", myname, name);
1243 dns_status = dns_lookup_types(name, 0, (DNS_RR **) 0, (VSTRING *) 0,
1244 - (VSTRING *) 0, T_A, T_MX, 0);
1245 + (VSTRING *) 0, T_A, T_MX,
1250 if (dns_status != DNS_OK)
1251 return (smtpd_check_reject(state, MAIL_ERROR_POLICY,
1252 "%d <%s>: %s odrzucony/rejected: Domain not found",
1253 @@ -1167,6 +1175,49 @@
1255 static int has_my_addr(const char *host)
1258 + char *myname = "has_my_addr";
1259 + struct addrinfo hints, *res, *res0;
1261 + char hbuf[NI_MAXHOST];
1264 + msg_info("%s: host %s", myname, host);
1267 + * If we can't lookup the host, play safe and assume it is OK.
1272 + memset(&hints, 0, sizeof(hints));
1273 + hints.ai_family = PF_UNSPEC;
1274 + hints.ai_socktype = SOCK_DGRAM;
1275 + error = getaddrinfo(host, NULL, &hints, &res0);
1278 + msg_info("%s: host %s: %s", myname, host, gai_strerror(error));
1281 + for (res = res0; res; res = res->ai_next) {
1282 + if (msg_verbose) {
1283 + if (getnameinfo(res->ai_addr, res->ai_addrlen, hbuf, sizeof(hbuf),
1284 + NULL, 0, NI_NUMERICHOST)) {
1285 + strncpy(hbuf, "???", sizeof(hbuf));
1287 + msg_info("%s: addr %s", myname, hbuf);
1289 + if (own_inet_addr(res->ai_addr)) {
1290 + freeaddrinfo(res0);
1294 + freeaddrinfo(res0);
1296 + msg_info("%s: host %s: no match", myname, host);
1300 char *myname = "has_my_addr";
1301 struct in_addr addr;
1303 @@ -1202,6 +1253,7 @@
1304 msg_info("%s: host %s: no match", myname, host);
1310 /* i_am_mx - is this machine listed as MX relay */
1311 @@ -1794,7 +1846,7 @@
1312 static int reject_maps_rbl(SMTPD_STATE *state)
1314 char *myname = "reject_maps_rbl";
1315 - ARGV *octets = argv_split(state->addr, ".");
1317 VSTRING *query = vstring_alloc(100);
1318 char *saved_domains = mystrdup(var_maps_rbl_domains);
1319 char *bp = saved_domains;
1320 @@ -1806,17 +1858,29 @@
1321 int dns_status = DNS_FAIL;
1328 msg_info("%s: %s", myname, state->addr);
1331 - * IPv4 only for now
1335 + /* IPv4 only for now */
1336 if (inet_pton(AF_INET, state->addr, &a) != 1)
1337 return SMTPD_CHECK_DUNNO;
1338 + octets = argv_split(state->addr, ".");
1340 + /* IPv4 and IPv6-mapped IPv4 only for now */
1341 + if (inet_pton(AF_INET, state->addr, &a) == 1)
1342 + octets = argv_split(state->addr, ".");
1344 + struct in6_addr a6;
1345 + if (inet_pton(AF_INET6, state->addr, &a6) != 1)
1346 + return SMTPD_CHECK_DUNNO;
1347 + if (!IN6_IS_ADDR_V4MAPPED(&a6) || (strrchr(state->addr,':') == NULL))
1348 + return SMTPD_CHECK_DUNNO;
1349 + octets = argv_split(strrchr(state->addr,':')+1, ".");
1354 diff -Nur snapshot-20011127.orig/src/smtpd/smtpd_peer.c snapshot-20011127/src/smtpd/smtpd_peer.c
1355 --- snapshot-20011127.orig/src/smtpd/smtpd_peer.c Thu Jul 5 22:09:47 2001
1356 +++ snapshot-20011127/src/smtpd/smtpd_peer.c Mon Dec 3 14:16:39 2001
1361 +/* Utility library. */
1364 +#include <mymalloc.h>
1365 +#include <valid_hostname.h>
1366 +#include <stringops.h>
1368 +/* Global library. */
1371 * Older systems don't have h_errno. Even modern systems don't have
1377 -/* Utility library. */
1380 -#include <mymalloc.h>
1381 -#include <valid_hostname.h>
1382 -#include <stringops.h>
1384 -/* Global library. */
1388 +#define GAI_STRERROR(error) \
1389 + ((error = EAI_SYSTEM) ? gai_strerror(error) : strerror(errno))
1392 /* Application-specific. */
1395 @@ -102,16 +106,23 @@
1397 void smtpd_peer_init(SMTPD_STATE *state)
1399 - struct sockaddr_in sin;
1400 - SOCKADDR_SIZE len = sizeof(sin);
1402 + struct sockaddr_storage ss;
1404 + struct sockaddr ss;
1405 + struct in_addr *in;
1409 + struct sockaddr *sa;
1410 + SOCKADDR_SIZE len;
1412 + sa = (struct sockaddr *)&ss;
1416 * Look up the peer address information.
1418 - if (getpeername(vstream_fileno(state->client),
1419 - (struct sockaddr *) & sin, &len) >= 0) {
1420 + if (getpeername(vstream_fileno(state->client), sa, &len) >= 0) {
1424 @@ -127,18 +138,51 @@
1426 * Look up and "verify" the client hostname.
1428 - else if (errno == 0 && sin.sin_family == AF_INET) {
1429 - state->addr = mystrdup(inet_ntoa(sin.sin_addr));
1430 - hp = gethostbyaddr((char *) &(sin.sin_addr),
1431 - sizeof(sin.sin_addr), AF_INET);
1433 + else if (errno == 0 && (sa->sa_family == AF_INET
1435 + || sa->sa_family == AF_INET6
1439 + char hbuf[NI_MAXHOST];
1440 + char abuf[NI_MAXHOST];
1441 + struct addrinfo hints, *rnull = NULL;
1443 + char abuf[sizeof("255.255.255.255") + 1];
1449 + (void)getnameinfo(sa, len, abuf, sizeof(hbuf), NULL, 0, NI_NUMERICHOST);
1451 + in = &((struct sockaddr_in *)sa)->sin_addr;
1452 + inet_ntop(AF_INET, in, abuf, sizeof(hbuf));
1454 + state->addr = mystrdup(abuf);
1456 + error = getnameinfo(sa, len, hbuf, sizeof(hbuf), NULL, 0, NI_NAMEREQD);
1459 + hp = gethostbyaddr((char *)in, sizeof(*in), AF_INET);
1462 + hbuf = mystrdup(hp->h_name);
1467 state->name = mystrdup("unknown");
1469 + state->peer_code = (error == EAI_AGAIN ? 4 : 5);
1471 state->peer_code = (h_errno == TRY_AGAIN ? 4 : 5);
1472 - } else if (!valid_hostname(hp->h_name, DONT_GRIPE)) {
1474 + } else if (!valid_hostname(hbuf, DONT_GRIPE)) {
1475 state->name = mystrdup("unknown");
1476 state->peer_code = 5;
1478 - state->name = mystrdup(hp->h_name); /* hp->name is clobbered!! */
1479 + state->name = mystrdup(hbuf); /* hp->name is clobbered!! */
1480 state->peer_code = 2;
1483 @@ -150,16 +194,31 @@
1484 state->peer_code = code; \
1488 + memset(&hints, 0, sizeof(hints));
1489 + hints.ai_family = AF_UNSPEC;
1490 + hints.ai_socktype = SOCK_STREAM;
1491 + error = getaddrinfo(state->name, NULL, &hints, &rnull);
1493 + msg_warn("%s: hostname %s verification failed: %s",
1494 + state->addr, state->name, GAI_STRERROR(error));
1495 + REJECT_PEER_NAME(state, (error == EAI_AGAIN ? 4 : 5));
1497 + /* memcmp() isn't needed if we use getaddrinfo */
1499 + freeaddrinfo(rnull);
1501 hp = gethostbyname(state->name); /* clobbers hp->name!! */
1503 msg_warn("%s: hostname %s verification failed: %s",
1504 state->addr, state->name, HSTRERROR(h_errno));
1505 REJECT_PEER_NAME(state, (h_errno == TRY_AGAIN ? 4 : 5));
1506 - } else if (hp->h_length != sizeof(sin.sin_addr)) {
1507 + } else if (hp->h_length != sizeof(*in)) {
1508 msg_warn("%s: hostname %s verification failed: bad address size %d",
1509 state->addr, state->name, hp->h_length);
1510 REJECT_PEER_NAME(state, 5);
1513 for (i = 0; /* void */ ; i++) {
1514 if (hp->h_addr_list[i] == 0) {
1515 msg_warn("%s: address not listed for hostname %s",
1516 @@ -167,12 +226,11 @@
1517 REJECT_PEER_NAME(state, 5);
1520 - if (memcmp(hp->h_addr_list[i],
1521 - (char *) &sin.sin_addr,
1522 - sizeof(sin.sin_addr)) == 0)
1523 + if (memcmp(hp->h_addr_list[i], (char *)in, sizeof(*in)) == 0)
1524 break; /* keep peer name */
1531 diff -Nur snapshot-20011127.orig/src/smtpstone/smtp-sink.c snapshot-20011127/src/smtpstone/smtp-sink.c
1532 --- snapshot-20011127.orig/src/smtpstone/smtp-sink.c Thu Nov 8 21:15:32 2001
1533 +++ snapshot-20011127/src/smtpstone/smtp-sink.c Mon Dec 3 14:16:39 2001
1536 if (strncmp(argv[optind], "inet:", 5) == 0)
1538 - sock = inet_listen(argv[optind], backlog, BLOCKING);
1539 + sock = inet_listen(argv[optind], backlog, BLOCKING, 1);
1543 diff -Nur snapshot-20011127.orig/src/util/Makefile.in snapshot-20011127/src/util/Makefile.in
1544 --- snapshot-20011127.orig/src/util/Makefile.in Mon Dec 3 14:15:13 2001
1545 +++ snapshot-20011127/src/util/Makefile.in Mon Dec 3 14:16:39 2001
1547 dict_nisplus.c dict_open.c dir_forest.c doze.c environ.c \
1548 events.c exec_command.c fifo_listen.c fifo_trigger.c file_limit.c \
1549 find_inet.c fsspace.c fullname.c get_domainname.c get_hostname.c \
1551 htable.c inet_addr_host.c inet_addr_list.c inet_addr_local.c \
1552 inet_connect.c inet_listen.c inet_trigger.c inet_util.c \
1553 line_wrap.c lowercase.c lstat_as.c mac_parse.c make_dirs.c \
1555 dict_nisplus.o dict_open.o dir_forest.o doze.o environ.o \
1556 events.o exec_command.o fifo_listen.o fifo_trigger.o file_limit.o \
1557 find_inet.o fsspace.o fullname.o get_domainname.o get_hostname.o \
1559 htable.o inet_addr_host.o inet_addr_list.o inet_addr_local.o \
1560 inet_connect.o inet_listen.o inet_trigger.o inet_util.o \
1561 line_wrap.o lowercase.o lstat_as.o mac_parse.o make_dirs.o \
1563 dict_dbm.h dict_env.h dict_ht.h dict_ldap.h dict_mysql.h \
1564 dict_ni.h dict_nis.h dict_nisplus.h dir_forest.h events.h \
1565 exec_command.h find_inet.h fsspace.h fullname.h get_domainname.h \
1567 get_hostname.h htable.h inet_addr_host.h inet_addr_list.h \
1568 inet_addr_local.h inet_util.h iostuff.h line_wrap.h listen.h lstat_as.h \
1569 mac_parse.h make_dirs.h match_list.h match_ops.h msg.h msg_output.h \
1571 get_domainname.o: mymalloc.h
1572 get_domainname.o: get_hostname.h
1573 get_domainname.o: get_domainname.h
1574 +get_port.o: sys_defs.h
1575 get_hostname.o: get_hostname.c
1576 get_hostname.o: sys_defs.h
1577 get_hostname.o: mymalloc.h
1579 match_list.o: stringops.h
1580 match_list.o: argv.h
1581 match_list.o: dict.h
1582 +match_list.o: inet_util.h
1583 match_list.o: match_ops.h
1584 match_list.o: match_list.h
1585 match_ops.o: match_ops.c
1586 diff -Nur snapshot-20011127.orig/src/util/get_port.c snapshot-20011127/src/util/get_port.c
1587 --- snapshot-20011127.orig/src/util/get_port.c Thu Jan 1 01:00:00 1970
1588 +++ snapshot-20011127/src/util/get_port.c Mon Dec 3 14:16:39 2001
1594 +/* trivial host and port extracter
1596 +/* #include <get_port.h>
1598 +/* char *get_port(data)
1602 +/* get_port() extract host name or ip address from
1603 +/* strings such as [3ffe:902:12::10]:25, [::1]
1604 +/* or 192.168.0.1:25, and null-terminates the
1605 +/* \fIdata\fR at the first occurrence of port separator.
1607 +/* If port not found return null pointer.
1611 +/* BSD Style (or BSD like) license.
1613 +/* Arkadiusz Mi¶kiewicz <misiek@pld.org.pl>
1617 +/* System libraries */
1619 +#include <sys_defs.h>
1620 +#include <string.h>
1622 +/* Utility library. */
1624 +#include "get_port.h"
1626 +/* get_port - extract port number from string */
1628 +char *get_port(char *data)
1630 + const char *escl=strchr(data,'[');
1631 + const char *sepl=strchr(data,':');
1632 + char *escr=strrchr(data,']');
1633 + char *sepr=strrchr(data,':');
1635 + /* extract from "[address]:port" or "[address]"*/
1638 + memmove(data, data + 1, strlen(data) - strlen(escr));
1639 + data[strlen(data) - strlen(escr) - 1] = 0;
1643 + return (*escr ? escr : NULL);
1645 + /* extract from "address:port" or "address" */
1646 + if ((sepl == sepr) && sepr && sepl)
1652 + /* return empty string */
1655 diff -Nur snapshot-20011127.orig/src/util/get_port.h snapshot-20011127/src/util/get_port.h
1656 --- snapshot-20011127.orig/src/util/get_port.h Thu Jan 1 01:00:00 1970
1657 +++ snapshot-20011127/src/util/get_port.h Mon Dec 3 14:16:39 2001
1659 +#ifndef _GET_PORT_H_INCLUDED_
1660 +#define _GET_PORT_H_INCLUDED_
1666 +/* trivial host and port extracter
1668 +/* #include <get_port.h>
1672 + /* External interface. */
1674 +extern char *get_port(char *);
1680 +/* BSD Style (or BSD like) license.
1682 +/* Arkadiusz Mi¶kiewicz <misiek@pld.org.pl>
1687 diff -Nur snapshot-20011127.orig/src/util/inet_addr_host.c snapshot-20011127/src/util/inet_addr_host.c
1688 --- snapshot-20011127.orig/src/util/inet_addr_host.c Fri Dec 11 19:55:35 1998
1689 +++ snapshot-20011127/src/util/inet_addr_host.c Mon Dec 3 14:16:39 2001
1691 #include <sys_defs.h>
1692 #include <netinet/in.h>
1693 #include <arpa/inet.h>
1694 +#include <sys/socket.h>
1696 +#include <stdlib.h>
1697 +#include <string.h>
1700 #define INADDR_NONE 0xffffffff
1703 #include <inet_addr_list.h>
1704 #include <inet_addr_host.h>
1709 /* inet_addr_host - look up address list for host */
1711 int inet_addr_host(INET_ADDR_LIST *addr_list, const char *hostname)
1715 + struct addrinfo hints, *res0, *res;
1717 + char buforhosta[1024];
1722 struct in_addr addr;
1724 int initial_count = addr_list->used;
1727 + memset(&hints, 0, sizeof(hints));
1728 + hints.ai_family = PF_UNSPEC;
1729 + hints.ai_socktype = SOCK_DGRAM;
1730 + error = getaddrinfo(hostname, NULL, &hints, &res0);
1732 + for (res = res0; res; res = res->ai_next) {
1733 + if(res->ai_family != AF_INET && res->ai_family != AF_INET6)
1735 + /* filter out address families that are not supported */
1736 + s = socket(res->ai_family, SOCK_DGRAM, 0);
1741 + inet_addr_list_append(addr_list, res->ai_addr);
1743 + freeaddrinfo(res0);
1746 if ((addr.s_addr = inet_addr(hostname)) != INADDR_NONE) {
1747 inet_addr_list_append(addr_list, &addr);
1750 inet_addr_list_append(addr_list,
1751 (struct in_addr *) * hp->h_addr_list++);
1755 return (addr_list->used - initial_count);
1764 INET_ADDR_LIST addr_list;
1766 + struct sockaddr *sa;
1767 + char hbuf[NI_MAXHOST];
1769 msg_vstream_init(argv[0], VSTREAM_ERR);
1772 if (inet_addr_host(&addr_list, *argv) == 0)
1773 msg_fatal("not found: %s", *argv);
1775 - for (i = 0; i < addr_list.used; i++)
1776 - vstream_printf("%s\n", inet_ntoa(addr_list.addrs[i]));
1777 + for (i = 0; i < addr_list.used; i++) {
1778 + sa = (struct sockaddr *)&addr_list.addrs[i];
1779 + getnameinfo(sa, SA_LEN(sa), hbuf, sizeof(hbuf), NULL, 0,
1781 + vstream_printf("%s\n", hbuf);
1783 vstream_fflush(VSTREAM_OUT);
1785 inet_addr_list_free(&addr_list);
1786 diff -Nur snapshot-20011127.orig/src/util/inet_addr_list.c snapshot-20011127/src/util/inet_addr_list.c
1787 --- snapshot-20011127.orig/src/util/inet_addr_list.c Tue Jul 31 20:13:41 2001
1788 +++ snapshot-20011127/src/util/inet_addr_list.c Mon Dec 3 14:21:19 2001
1790 #include <arpa/inet.h>
1796 +#include <string.h>
1797 +#include <sys/socket.h>
1800 /* Utility library. */
1808 + list->addrs = (struct sockaddr_storage *)
1810 list->addrs = (struct in_addr *)
1812 mymalloc(sizeof(*list->addrs) * list->size);
1815 /* inet_addr_list_append - append address to internet address list */
1818 +void inet_addr_list_append(INET_ADDR_LIST *list,
1819 + struct sockaddr * addr)
1821 + char *myname = "inet_addr_list_append";
1822 + char hbuf[NI_MAXHOST];
1824 + if (msg_verbose > 1) {
1825 + if (getnameinfo(addr, SA_LEN(addr), hbuf, sizeof(hbuf), NULL, 0,
1826 + NI_NUMERICHOST)) {
1827 + strncpy(hbuf, "??????", sizeof(hbuf));
1829 + msg_info("%s: %s", myname, hbuf);
1832 + if (list->used >= list->size)
1834 + list->addrs = (struct sockaddr_storage *)
1835 + myrealloc((char *) list->addrs,
1836 + sizeof(*list->addrs) * list->size);
1837 + memcpy(&list->addrs[list->used++], addr, SA_LEN(addr));
1840 void inet_addr_list_append(INET_ADDR_LIST *list, struct in_addr * addr)
1842 char *myname = "inet_addr_list_append";
1843 @@ -83,15 +117,22 @@
1844 sizeof(*list->addrs) * list->size);
1845 list->addrs[list->used++] = *addr;
1849 /* inet_addr_list_comp - compare addresses */
1851 static int inet_addr_list_comp(const void *a, const void *b)
1854 + if(((struct sockaddr*)a)->sa_family != ((struct sockaddr*)b)->sa_family)
1855 + return ( ((struct sockaddr*)a)->sa_family - ((struct sockaddr*)b)->sa_family );
1856 + return memcmp(a,b,SA_LEN((struct sockaddr*)a));
1858 const struct in_addr *a_addr = (const struct in_addr *) a;
1859 const struct in_addr *b_addr = (const struct in_addr *) b;
1861 return (a_addr->s_addr - b_addr->s_addr);
1865 /* inet_addr_list_uniq - weed out duplicates */
1866 diff -Nur snapshot-20011127.orig/src/util/inet_addr_list.h snapshot-20011127/src/util/inet_addr_list.h
1867 --- snapshot-20011127.orig/src/util/inet_addr_list.h Tue Jul 31 19:56:47 2001
1868 +++ snapshot-20011127/src/util/inet_addr_list.h Mon Dec 3 14:16:39 2001
1871 #include <netinet/in.h>
1875 +#define SA_LEN(x) (((x)->sa_family == AF_INET6) ? sizeof(struct sockaddr_in6) : sizeof(struct sockaddr_in))
1876 +#define SS_LEN(x) (((x).ss_family == AF_INET6) ? sizeof(struct sockaddr_in6) : sizeof(struct sockaddr_in))
1878 +#define SA_LEN(x) ((x)->sa_len)
1879 +#define SS_LEN(x) ((x).ss_len)
1884 * External interface.
1886 typedef struct INET_ADDR_LIST {
1887 int used; /* nr of elements in use */
1888 int size; /* actual list size */
1890 + struct sockaddr_storage *addrs; /* payload */
1892 struct in_addr *addrs; /* payload */
1896 extern void inet_addr_list_init(INET_ADDR_LIST *);
1897 extern void inet_addr_list_free(INET_ADDR_LIST *);
1898 extern void inet_addr_list_uniq(INET_ADDR_LIST *);
1901 +extern void inet_addr_list_append(INET_ADDR_LIST *, struct sockaddr *);
1903 extern void inet_addr_list_append(INET_ADDR_LIST *, struct in_addr *);
1908 diff -Nur snapshot-20011127.orig/src/util/inet_addr_local.c snapshot-20011127/src/util/inet_addr_local.c
1909 --- snapshot-20011127.orig/src/util/inet_addr_local.c Sun Feb 25 19:20:19 2001
1910 +++ snapshot-20011127/src/util/inet_addr_local.c Mon Dec 3 14:16:39 2001
1915 +#if defined(INET6) && (defined (LINUX) || defined (LINUX2))
1919 +#ifdef HAVE_GETIFADDRS
1920 +#include <ifaddrs.h>
1923 /* Utility library. */
1927 int inet_addr_local(INET_ADDR_LIST *addr_list, INET_ADDR_LIST *mask_list)
1929 +#ifdef HAVE_GETIFADDRS
1930 + char *myname = "inet_addr_local";
1931 + struct ifaddrs *ifap, *ifa;
1932 + int initial_count = addr_list->used;
1933 + struct sockaddr *sa;
1936 + struct sockaddr_in6 addr6;
1942 + if (getifaddrs(&ifap) < 0)
1943 + msg_fatal("%s: getifaddrs: %m", myname);
1945 + for (ifa = ifap; ifa; ifa = ifa->ifa_next) {
1946 + if (! (ifa->ifa_flags & IFF_RUNNING) || ifa->ifa_addr==NULL)
1948 + sa = ifa->ifa_addr;
1949 + switch (ifa->ifa_addr->sa_family) {
1952 + addr = (void *)&((struct sockaddr_in *)ifa->ifa_addr)->sin_addr;
1958 + memcpy(&addr6, ifa->ifa_addr, ifa->ifa_addr->sa_len);
1959 + /* decode scoped address notation */
1960 + if ((IN6_IS_ADDR_LINKLOCAL(&addr6.sin6_addr) ||
1961 + IN6_IS_ADDR_SITELOCAL(&addr6.sin6_addr)) &&
1962 + addr6.sin6_scope_id == 0) {
1963 + addr6.sin6_scope_id = ntohs(addr6.sin6_addr.s6_addr[3] |
1964 + (unsigned int)addr6.sin6_addr.s6_addr[2] << 8);
1965 + addr6.sin6_addr.s6_addr[2] = addr6.sin6_addr.s6_addr[3] = 0;
1966 + sa = (struct sockaddr *)&addr6;
1976 + inet_addr_list_append(addr_list, sa);
1978 + inet_addr_list_append(addr_list, (struct in_addr *)addr);
1982 + freeifaddrs(ifap);
1983 + return (addr_list->used - initial_count);
1985 char *myname = "inet_addr_local";
1988 struct ifreq *the_end;
1990 - VSTRING *buf = vstring_alloc(1024);
1992 int initial_count = addr_list->used;
1993 struct in_addr addr;
1994 struct ifreq *ifr_mask;
1997 +#if defined (LINUX) || defined (LINUX2)
1998 +#define _PATH_PROCNET_IFINET6 "/proc/net/if_inet6"
2000 + char addr6p[8][5], addr6res[40], devname[20];
2001 + int plen, scope, dad_status, if_idx, gaierror;
2002 + struct addrinfo hints, *res, *res0;
2004 + struct sockaddr_in6 addr6;
2006 - if ((sock = socket(PF_INET, SOCK_DGRAM, 0)) < 0)
2009 + buf = vstring_alloc(1024);
2011 + if ((sock = socket(af, SOCK_DGRAM, 0)) < 0) {
2013 + if (af == AF_INET6)
2016 + msg_warn("%s: socket: %m", myname);
2021 msg_fatal("%s: socket: %m", myname);
2025 * Get the network interface list. XXX The socket API appears to have no
2026 @@ -126,10 +213,15 @@
2028 the_end = (struct ifreq *) (ifc.ifc_buf + ifc.ifc_len);
2029 for (ifr = ifc.ifc_req; ifr < the_end;) {
2030 - if (ifr->ifr_addr.sa_family == AF_INET) { /* IP interface */
2031 + if ((ifr->ifr_addr.sa_family == AF_INET) &&
2032 + (ifr->ifr_addr.sa_family == af)) { /* IP interface */
2033 addr = ((struct sockaddr_in *) & ifr->ifr_addr)->sin_addr;
2034 if (addr.s_addr != INADDR_ANY) { /* has IP address */
2036 + inet_addr_list_append(addr_list, &ifr->ifr_addr);
2038 inet_addr_list_append(addr_list, &addr);
2041 ifr_mask = (struct ifreq *) mymalloc(IFREQ_SIZE(ifr));
2042 memcpy((char *) ifr_mask, (char *) ifr, IFREQ_SIZE(ifr));
2043 @@ -141,11 +233,61 @@
2048 + else if ((ifr->ifr_addr.sa_family == AF_INET6) &&
2049 + (ifr->ifr_addr.sa_family == af)) { /* IPv6 interface */
2050 + addr6 = *((struct sockaddr_in6 *) & ifr->ifr_addr);
2052 + /* decode scoped address notation */
2053 + if ((IN6_IS_ADDR_LINKLOCAL(&addr6.sin6_addr) ||
2054 + IN6_IS_ADDR_SITELOCAL(&addr6.sin6_addr)) &&
2055 + addr6.sin6_scope_id == 0) {
2056 + addr6.sin6_scope_id = ntohs(addr6.sin6_addr.s6_addr[3] |
2057 + (unsigned int)addr6.sin6_addr.s6_addr[2] << 8);
2058 + addr6.sin6_addr.s6_addr[2] = addr6.sin6_addr.s6_addr[3] = 0;
2061 + if (!(IN6_IS_ADDR_UNSPECIFIED(&addr6.sin6_addr)))
2062 + inet_addr_list_append(addr_list, (struct sockaddr *)&addr6);
2065 ifr = NEXT_INTERFACE(ifr);
2071 + if (af != AF_INET6) {
2073 + goto other_socket_type;
2075 +#if defined (LINUX) || defined (LINUX2)
2076 + if ((f = fopen(_PATH_PROCNET_IFINET6, "r")) != NULL) {
2077 + while (fscanf(f, "%4s%4s%4s%4s%4s%4s%4s%4s %02x %02x %02x %02x %20s\n",
2078 + addr6p[0], addr6p[1], addr6p[2], addr6p[3], addr6p[4],
2079 + addr6p[5], addr6p[6], addr6p[7],
2080 + &if_idx, &plen, &scope, &dad_status, devname) != EOF) {
2081 + sprintf(addr6res, "%s:%s:%s:%s:%s:%s:%s:%s",
2082 + addr6p[0], addr6p[1], addr6p[2], addr6p[3],
2083 + addr6p[4], addr6p[5], addr6p[6], addr6p[7]);
2084 + addr6res[sizeof(addr6res) - 1] = 0;
2085 + memset(&hints, 0, sizeof(hints));
2086 + hints.ai_flags = AI_NUMERICHOST;
2087 + hints.ai_family = AF_UNSPEC;
2088 + hints.ai_socktype = SOCK_DGRAM;
2089 + gaierror = getaddrinfo(addr6res, NULL, &hints, &res0);
2091 + for (res = res0; res; res = res->ai_next) {
2092 + inet_addr_list_append(addr_list, res->ai_addr);
2094 + freeaddrinfo(res0);
2100 return (addr_list->used - initial_count);
2106 INET_ADDR_LIST addr_list;
2107 INET_ADDR_LIST mask_list;
2109 + char abuf[NI_MAXHOST], mbuf[NI_MAXHOST];
2110 + struct sockaddr *sa;
2112 msg_vstream_init(argv[0], VSTREAM_ERR);
2114 @@ -172,8 +316,17 @@
2115 msg_warn("found only one active network interface");
2117 for (i = 0; i < addr_list.used; i++) {
2118 - vstream_printf("%s/", inet_ntoa(addr_list.addrs[i]));
2119 - vstream_printf("%s\n", inet_ntoa(mask_list.addrs[i]));
2120 + sa = (struct sockaddr *)&addr_list.addrs[i];
2121 + if (getnameinfo(sa, SA_LEN(sa), abuf, sizeof(abuf), NULL, 0,
2122 + NI_NUMERICHOST)) {
2123 + strncpy(abuf, "???", sizeof(abuf));
2125 + sa = (struct sockaddr *)&mask_list.addrs[i];
2126 + if (getnameinfo(sa, SA_LEN(sa), mbuf, sizeof(mbuf), NULL, 0,
2127 + NI_NUMERICHOST)) {
2128 + strncpy(mbuf, "???", sizeof(mbuf));
2130 + vstream_printf("%s/%s\n", abuf, mbuf);
2132 vstream_fflush(VSTREAM_OUT);
2133 inet_addr_list_free(&addr_list);
2134 diff -Nur snapshot-20011127.orig/src/util/inet_connect.c snapshot-20011127/src/util/inet_connect.c
2135 --- snapshot-20011127.orig/src/util/inet_connect.c Mon Nov 20 19:06:31 2000
2136 +++ snapshot-20011127/src/util/inet_connect.c Mon Dec 3 14:16:39 2001
2145 /* Utility library. */
2152 + struct addrinfo hints, *res, *res0;
2155 struct sockaddr_in sin;
2163 buf = inet_parse(addr, &host, &port);
2167 + memset(&hints, 0, sizeof(hints));
2168 + hints.ai_family = PF_UNSPEC;
2169 + hints.ai_socktype = SOCK_STREAM;
2170 + hints.ai_flags = AI_NUMERICHOST; /* find_inet_addr is numeric only */
2171 + if (getaddrinfo(host, port, &hints, &res0))
2172 + msg_fatal("host not found: %s", host);
2176 memset((char *) &sin, 0, sizeof(sin));
2177 sin.sin_family = AF_INET;
2178 sin.sin_addr.s_addr = find_inet_addr(host);
2179 sin.sin_port = find_inet_port(port, "tcp");
2185 + for (res = res0; res; res = res->ai_next) {
2186 + if ((res->ai_family != AF_INET) && (res->ai_family != AF_INET6))
2189 + sock = socket(res->ai_family, res->ai_socktype, res->ai_protocol);
2192 + if (timeout > 0) {
2193 + non_blocking(sock, NON_BLOCKING);
2194 + if (timed_connect(sock, res->ai_addr, res->ai_addrlen, timeout) < 0) {
2199 + if (block_mode != NON_BLOCKING)
2200 + non_blocking(sock, block_mode);
2203 + non_blocking(sock, block_mode);
2204 + if (connect(sock, res->ai_addr, res->ai_addrlen) < 0
2205 + && errno != EINPROGRESS) {
2213 + freeaddrinfo(res0);
2217 * Create a client socket.
2225 diff -Nur snapshot-20011127.orig/src/util/inet_listen.c snapshot-20011127/src/util/inet_listen.c
2226 --- snapshot-20011127.orig/src/util/inet_listen.c Mon Nov 20 19:06:32 2000
2227 +++ snapshot-20011127/src/util/inet_listen.c Mon Dec 3 14:16:39 2001
2230 /* #include <listen.h>
2232 -/* int inet_listen(addr, backlog, block_mode)
2233 +/* int inet_listen(addr, backlog, block_mode, addinuse_fatal)
2234 /* const char *addr;
2238 #include <sys_defs.h>
2239 #include <sys/socket.h>
2240 #include <netinet/in.h>
2242 +#if (! __GLIBC__ >= 2 && __GLIBC_MINOR__ >=1 )
2243 +#include <netinet6/in6.h>
2246 #include <arpa/inet.h>
2248 #ifndef MAXHOSTNAMELEN
2249 #include <sys/param.h>
2255 @@ -77,35 +83,116 @@
2257 /* inet_listen - create inet-domain listener */
2259 -int inet_listen(const char *addr, int backlog, int block_mode)
2260 +int inet_listen(const char *addr, int backlog, int block_mode, int addrinuse_fatal)
2263 + struct addrinfo *res, *res0, hints;
2270 + struct sockaddr *ai_addr;
2271 + SOCKADDR_SIZE ai_addrlen;
2272 + struct ai *ai_next;
2273 + } *res, *res0, resbody;
2274 struct sockaddr_in sin;
2278 + int addrinuse = 0;
2283 + char hbuf[NI_MAXHOST], pbuf[NI_MAXSERV];
2285 + char hbuf[sizeof("255.255.255.255") + 1];
2286 + char pbuf[sizeof("255.255.255.255") + 1];
2288 + char *cause = "unknown";
2291 * Translate address information to internal form.
2293 buf = inet_parse(addr, &host, &port);
2294 - memset((char *) &sin, 0, sizeof(sin));
2296 + memset(&hints, 0, sizeof(hints));
2297 + hints.ai_flags = AI_PASSIVE;
2298 + hints.ai_family = AF_UNSPEC;
2299 + hints.ai_socktype = SOCK_STREAM;
2300 + error = getaddrinfo(*host ? host : NULL, *port ? port : "0", &hints, &res0);
2302 + msg_fatal("getaddrinfo: %s", gai_strerror(error));
2306 + memset(&sin, 0, sizeof(sin));
2307 sin.sin_family = AF_INET;
2309 + sin.sin_len = sizeof(sin);
2311 sin.sin_port = find_inet_port(port, "tcp");
2312 sin.sin_addr.s_addr = (*host ? find_inet_addr(host) : INADDR_ANY);
2316 - * Create a listener socket.
2318 - if ((sock = socket(AF_INET, SOCK_STREAM, 0)) < 0)
2319 - msg_fatal("socket: %m");
2320 - if (setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, (char *) &t, sizeof(t)) < 0)
2321 - msg_fatal("setsockopt: %m");
2322 - if (bind(sock, (struct sockaddr *) & sin, sizeof(sin)) < 0)
2323 - msg_fatal("bind %s port %d: %m", sin.sin_addr.s_addr == INADDR_ANY ?
2324 - "INADDR_ANY" : inet_ntoa(sin.sin_addr), ntohs(sin.sin_port));
2325 + memset(&resbody, 0, sizeof(resbody));
2326 + resbody.ai_socktype = SOCK_STREAM;
2327 + resbody.ai_family = AF_INET;
2328 + resbody.ai_addr = (struct sockaddr *)&sin;
2329 + resbody.ai_addrlen = sizeof(sin);
2335 + for (res = res0; res; res = res->ai_next) {
2336 + if ((res->ai_family != AF_INET) && (res->ai_family != AF_INET6))
2340 + * Create a listener socket.
2342 + if ((sock = socket(res->ai_family, res->ai_socktype, 0)) < 0) {
2347 + if (res->ai_family == AF_INET6 &&
2348 + setsockopt(sock, IPPROTO_IPV6, IPV6_V6ONLY, (char *) &t, sizeof(t)) < 0) {
2349 + /* if kernel/libc don't support this simple ignore it
2350 + cause = "setsockopt(IPV6_V6ONLY)";
2358 + if (setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, (char *) &t, sizeof(t)) < 0) {
2359 + cause = "setsockopt(SO_REUSEADDR)";
2365 + if (bind(sock, res->ai_addr, res->ai_addrlen) < 0) {
2367 + if (errno == EADDRINUSE)
2375 + if (sock < 0 && (addrinuse_fatal || !addrinuse))
2376 + msg_fatal("%s: %m", cause);
2378 + freeaddrinfo(res0);
2382 non_blocking(sock, block_mode);
2383 if (listen(sock, backlog) < 0)
2384 msg_fatal("listen: %m");
2385 diff -Nur snapshot-20011127.orig/src/util/listen.h snapshot-20011127/src/util/listen.h
2386 --- snapshot-20011127.orig/src/util/listen.h Mon Mar 22 02:57:11 1999
2387 +++ snapshot-20011127/src/util/listen.h Mon Dec 3 14:16:39 2001
2389 * Listener external interface.
2391 extern int unix_listen(const char *, int, int);
2392 -extern int inet_listen(const char *, int, int);
2393 +extern int inet_listen(const char *, int, int, int);
2394 extern int fifo_listen(const char *, int, int);
2395 extern int stream_listen(const char *, int, int);
2397 diff -Nur snapshot-20011127.orig/src/util/match_list.c snapshot-20011127/src/util/match_list.c
2398 --- snapshot-20011127.orig/src/util/match_list.c Tue Nov 20 21:07:15 2001
2399 +++ snapshot-20011127/src/util/match_list.c Mon Dec 3 14:16:39 2001
2401 list = match_list_parse(list, vstring_str(buf));
2402 if (vstream_fclose(fp))
2403 msg_fatal("%s: read file %s: %m", myname, pattern);
2404 - } else if (strchr(pattern, ':') != 0) { /* type:table */
2405 + } else if ((strchr(pattern, ']') == 0) && (strchr(pattern, ':') != 0)) { /* type:table */
2406 for (cp = pattern; *cp == '!'; cp++)
2408 if (dict_handle(pattern) == 0)
2409 diff -Nur snapshot-20011127.orig/src/util/match_ops.c snapshot-20011127/src/util/match_ops.c
2410 --- snapshot-20011127.orig/src/util/match_ops.c Tue Nov 20 21:16:10 2001
2411 +++ snapshot-20011127/src/util/match_ops.c Mon Dec 3 14:16:39 2001
2413 #include <match_ops.h>
2414 #include <stringops.h>
2420 + * This program is free software; you can redistribute it and/or
2421 + * modify it under the terms of the GNU General Public License
2422 + * as published by the Free Software Foundation; either version
2423 + * 2 of the License, or (at your option) any later version.
2425 + * Authors: Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
2428 + * Artur Frysiak <wiget@pld.org.pl>
2429 + * Arkadiusz Mi¶kiewicz <misiek@pld.org.pl>
2433 +#include <stdlib.h>
2434 +#include <unistd.h>
2435 +#include <syslog.h>
2437 +#include <sys/socket.h>
2438 +#include <netinet/in.h>
2439 +#include <string.h>
2441 +#include <arpa/inet.h>
2442 +#include <resolv.h>
2445 +#define AF_DECnet 12
2449 +#define PF_PACKET 17
2454 + unsigned char family;
2455 + unsigned char bytelen;
2456 + signed short bitlen;
2457 + unsigned int data[4];
2461 +int masked_match(char *, char *, char *);
2462 +int get_integer(int *, char *, int);
2463 +int get_addr_1(inet_prefix *, char *, int);
2464 +int get_prefix_1(inet_prefix *, char *, int);
2465 +int get_addr(inet_prefix *, char *, int);
2466 +int get_prefix(inet_prefix *, char *, int);
2467 +unsigned int get_addr32(char *);
2468 +int matches(char *, char *);
2469 +int inet_addr_match(inet_prefix *, inet_prefix *, int);
2470 +int mask_match(char *, char *, char *);
2472 +int get_integer(int *val, char *arg, int base)
2477 + if (!arg || !*arg)
2479 + res = strtol(arg, &ptr, base);
2480 + if (!ptr || ptr == arg || *ptr || res > INT_MAX || res < INT_MIN)
2486 +int get_addr_1(inet_prefix *addr, char *name, int family)
2489 + unsigned char *ap = (unsigned char*)addr->data;
2492 + memset(addr, 0, sizeof(*addr));
2494 + if (strcmp(name, "default") == 0 || strcmp(name, "any") == 0) {
2495 + if (family == AF_DECnet)
2497 + addr->family = family;
2498 + addr->bytelen = (family == AF_INET6 ? 16 : 4);
2499 + addr->bitlen = -1;
2503 + if (strchr(name, ':')) {
2504 + addr->family = AF_INET6;
2505 + if (family != AF_UNSPEC && family != AF_INET6)
2507 + if (inet_pton(AF_INET6, name, addr->data) <= 0)
2509 + addr->bytelen = 16;
2510 + addr->bitlen = -1;
2513 + addr->family = AF_INET;
2514 + if (family != AF_UNSPEC && family != AF_INET)
2516 + addr->bytelen = 4;
2517 + addr->bitlen = -1;
2518 + for (cp = name, i = 0; *cp; cp++) {
2519 + if (*cp <= '9' && *cp >= '0') {
2520 + ap[i] = 10*ap[i] + (*cp-'0');
2523 + if (*cp == '.' && ++i <= 3)
2530 +int get_prefix_1(inet_prefix *dst, char *arg, int family)
2536 + memset(dst, 0, sizeof(*dst));
2538 + if (strcmp(arg, "default") == 0 || strcmp(arg, "any") == 0) {
2539 + if (family == AF_DECnet)
2541 + dst->family = family;
2547 + slash = strchr(arg, '/');
2550 + err = get_addr_1(dst, arg, family);
2552 + switch(dst->family) {
2554 + dst->bitlen = 128;
2564 + if (get_integer(&plen, slash+1, 0) || plen > dst->bitlen) {
2568 + dst->bitlen = plen;
2577 +int get_addr(inet_prefix *dst, char *arg, int family)
2580 + if (family == AF_PACKET)
2583 + if (get_addr_1(dst, arg, family))
2588 +int get_prefix(inet_prefix *dst, char *arg, int family)
2591 + if (family == AF_PACKET)
2594 + if (get_prefix_1(dst, arg, family))
2599 +unsigned int get_addr32(char *name)
2602 + if (get_addr_1(&addr, name, AF_INET))
2604 + return addr.data[0];
2607 +int matches(char *cmd, char *pattern)
2609 + int len = strlen(cmd);
2610 + if (len > strlen(pattern))
2612 + return memcmp(pattern, cmd, len);
2615 +int inet_addr_match(inet_prefix *a, inet_prefix *b, int bits)
2617 + unsigned int *a1 = a->data;
2618 + unsigned int *a2 = b->data;
2619 + int words = bits >> 0x05;
2624 + if (memcmp(a1, a2, words << 2))
2628 + unsigned int w1, w2;
2629 + unsigned int mask;
2634 + mask = htonl((0xffffffff) << (0x20 - bits));
2636 + if ((w1 ^ w2) & mask)
2643 +/* zero if matches */
2644 +int mask_match(char *network, char *cprefix, char *address)
2646 + inet_prefix *inetwork;
2647 + inet_prefix *iaddress;
2650 + if (!(network && address && cprefix))
2652 + prefix = strtol(cprefix, (char **)NULL, 10);
2653 + if ((prefix < 0) || (prefix > 128))
2655 + if ((strlen(network) == 0) || (strlen(address) == 0))
2658 + inetwork = malloc(sizeof(inet_prefix));
2659 + iaddress = malloc(sizeof(inet_prefix));
2661 + if ((get_addr(iaddress, address, AF_UNSPEC) >= 0)
2662 + && (get_addr(inetwork, network, AF_UNSPEC) >= 0))
2663 + ret = inet_addr_match(inetwork, iaddress, prefix);
2669 + /* 1 if matches */
2670 + /* return (!ret); */
2671 + /* 0 if matches */
2676 + * masked_match() - universal for IPv4 and IPv6
2678 +int masked_match(net_tok, mask_tok, string)
2684 + struct in6_addr in6[2];
2685 + char v4addr[2][INET_ADDRSTRLEN];
2690 + /* Check for NULL */
2691 + if (!(net_tok && mask_tok && string))
2694 + /* If IPv6 mapped convert to native-IPv4 */
2696 + if (inet_pton(AF_INET6, net_tok, &in6[0]) == 1 &&
2697 + inet_pton(AF_INET6, string, &in6[1]) == 1 &&
2698 + IN6_IS_ADDR_V4MAPPED(&in6[0]) && IN6_IS_ADDR_V4MAPPED(&in6[1])) {
2699 + plen = atoi(mask_tok);
2700 + if (32 < plen && plen < 129) {
2701 + sprintf(newmask, "%d", plen - 96);
2702 + mask_tok = newmask;
2705 + (void)inet_ntop(AF_INET, &in6[0].s6_addr[12], v4addr[0],
2706 + sizeof(v4addr[0]));
2707 + net_tok = v4addr[0];
2708 + (void)inet_ntop(AF_INET, &in6[1].s6_addr[12], v4addr[1],
2709 + sizeof(v4addr[1]));
2710 + string = v4addr[1];
2713 + return (!mask_match(net_tok, mask_tok, string));
2717 /* match_string - match a string literal */
2719 int match_string(int unused_flags, const char *string, const char *pattern)
2725 /* match_parse_mask - parse net/mask pattern */
2727 static int match_parse_mask(const char *pattern, unsigned long *net_bits,
2728 @@ -198,27 +500,55 @@
2734 /* match_hostaddr - match host by address */
2736 int match_hostaddr(int unused_flags, const char *addr, const char *pattern)
2738 char *myname = "match_hostaddr";
2740 + char *network, *mask, *escl, *escr, *patternx;
2741 + struct in6_addr in6;
2742 + char v4addr[INET_ADDRSTRLEN];
2745 unsigned long mask_bits;
2746 unsigned long net_bits;
2747 unsigned long addr_bits;
2751 msg_info("%s: %s ~? %s", myname, addr, pattern);
2754 + if (addr[strspn(addr, "01234567890./:abcdef")] != 0)
2756 if (addr[strspn(addr, "01234567890./:")] != 0)
2761 + patternx = mystrdup(pattern);
2762 + escl = strchr(patternx,'[');
2763 + escr = strrchr(patternx,']');
2764 + if (escl && escr) {
2766 + sprintf(patternx, "%s%s", escl + 1, escr + 1);
2767 + pattern = patternx;
2772 * Try dictionary lookup. This can be case insensitive. XXX Probably
2773 * should also try again after stripping least significant octets.
2775 - if (strchr(pattern, ':') != 0) {
2777 + if (!(escl && escr) && strchr(pattern, ':') != 0)
2779 + if (strchr(pattern, ':') != 0)
2782 if (dict_lookup(pattern, addr) != 0)
2784 if (dict_errno != 0)
2785 @@ -229,6 +559,12 @@
2787 * Try an exact match with the host address.
2790 + if (inet_pton(AF_INET6, addr, &in6) == 1 && IN6_IS_ADDR_V4MAPPED(&in6)) {
2791 + (void)inet_ntop(AF_INET, &in6.s6_addr[12], v4addr, sizeof(v4addr));
2795 if (strcasecmp(addr, pattern) == 0) {
2798 @@ -237,6 +573,20 @@
2799 * In a net/mask pattern, the mask is specified as the number of bits of
2803 + network = mystrdup(patternx);
2804 + mask = split_at(network, '/');
2806 + if (masked_match(network, mask, (char *)addr)) {
2816 if (match_parse_mask(pattern, &net_bits, &mask_shift)) {
2817 addr_bits = inet_addr(addr);
2818 if (addr_bits == INADDR_NONE)
2820 mask_bits = htonl((0xffffffff) << (BITS_PER_ADDR - mask_shift));
2821 return ((addr_bits & mask_bits) == (net_bits & mask_bits));
2826 diff -Nur snapshot-20011127.orig/src/util/sys_defs.h snapshot-20011127/src/util/sys_defs.h
2827 --- snapshot-20011127.orig/src/util/sys_defs.h Mon Dec 3 14:15:12 2001
2828 +++ snapshot-20011127/src/util/sys_defs.h Mon Dec 3 14:16:39 2001
2830 #define DEF_MAILBOX_LOCK "flock, dotlock"
2833 +#if ((defined(__NetBSD_Version__) && __NetBSD_Version__ >= 105000000) || defined(USAGI_LIBINET6))
2834 +#define HAVE_GETIFADDRS
2840 diff -Nur snapshot-20011127.orig/src/util/valid_hostname.c snapshot-20011127/src/util/valid_hostname.c
2841 --- snapshot-20011127.orig/src/util/valid_hostname.c Sun Jan 28 15:10:18 2001
2842 +++ snapshot-20011127/src/util/valid_hostname.c Mon Dec 3 14:16:39 2001
2848 +#include <netinet/in.h>
2849 +#include <sys/socket.h>
2850 +#include <arpa/inet.h>
2854 /* Utility library. */
2857 @@ -103,7 +110,23 @@
2858 msg_warn("%s: misplaced hyphen: %.100s", myname, name);
2864 + else if (ch == ':') {
2865 + struct addrinfo hints, *res;
2867 + memset(&hints, 0, sizeof(hints));
2868 + hints.ai_family = AF_INET6;
2869 + hints.ai_socktype = SOCK_STREAM; /*dummy*/
2870 + hints.ai_flags = AI_NUMERICHOST;
2871 + if (getaddrinfo(name, "0", &hints, &res) == 0) {
2872 + freeaddrinfo(res);
2880 msg_warn("%s: invalid character %d(decimal): %.100s",
2887 + struct addrinfo hints, *res;
2890 #define BYTES_NEEDED 4
2892 @@ -146,6 +172,17 @@
2893 msg_warn("%s: empty address", myname);
2898 + memset(&hints, 0, sizeof(hints));
2899 + hints.ai_family = AF_INET6;
2900 + hints.ai_socktype = SOCK_STREAM; /*dummy*/
2901 + hints.ai_flags = AI_NUMERICHOST;
2902 + if (getaddrinfo(addr, "0", &hints, &res) == 0) {
2903 + freeaddrinfo(res);
2909 * Scary code to avoid sscanf() overflow nasties.