1 diff -Nur postfix-1.1.2.orig/makedefs postfix-1.1.2/makedefs
2 --- postfix-1.1.2.orig/makedefs Fri Jan 25 15:17:18 2002
3 +++ postfix-1.1.2/makedefs Mon Jan 28 12:40:04 2002
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;;
28 : ${CC='gcc $(WARN)'} ${OPT='-O'} ${DEBUG='-g'} ${AWK=awk}
32 + CCARGS="$CCARGS -DINET6 -D__ss_family=ss_family -D__ss_len=ss_len"
33 + if test -f /usr/local/v6/lib/libinet6.a; then
34 + SYSLIBS="$SYSLIBS -L/usr/local/v6/lib -linet6"
38 + CCARGS="$CCARGS -DINET6 -D__ss_family=ss_family -D__ss_len=ss_len"
41 + CCARGS="$CCARGS -DINET6 -D__ss_family=ss_family"
42 + if test -f /usr/include/libinet6/netinet/ip6.h -a \
43 + -f /usr/lib/libinet6.a; then
44 + CCARGS="$CCARGS -I/usr/include/libinet6 -DUSAGI_LIBINET6"
45 + SYSLIBS="$SYSLIBS -linet6"
50 export SYSTYPE AR ARFL RANLIB SYSLIBS CC OPT DEBUG AWK OPTS
53 diff -Nur postfix-1.1.2.orig/src/global/Makefile.in postfix-1.1.2/src/global/Makefile.in
54 --- postfix-1.1.2.orig/src/global/Makefile.in Mon Jan 28 12:38:34 2002
55 +++ postfix-1.1.2/src/global/Makefile.in Mon Jan 28 12:40:04 2002
56 diff -Nur postfix-1.1.2.orig/src/global/mynetworks.c postfix-1.1.2/src/global/mynetworks.c
58 timed_ipc.c tok822_find.c tok822_node.c tok822_parse.c \
59 tok822_resolve.c tok822_rewrite.c tok822_tree.c xtext.c bounce_log.c \
60 flush_clnt.c mail_conf_time.c mbox_conf.c mbox_open.c abounce.c \
61 - verp_sender.c match_parent_style.c mime_state.c header_token.c \
62 + verp_sender.c match_parent_style.c mime_state.c header_token.c wildcard_inet_addr.c\
63 strip_addr.c virtual8_maps.c hold_message.c dict_proxy.c mail_dict.c \
65 OBJS = been_here.o bounce.o canon_addr.o cleanup_strerror.o clnt_stream.o \
67 timed_ipc.o tok822_find.o tok822_node.o tok822_parse.o \
68 tok822_resolve.o tok822_rewrite.o tok822_tree.o xtext.o bounce_log.o \
69 flush_clnt.o mail_conf_time.o mbox_conf.o mbox_open.o abounce.o \
70 - verp_sender.o match_parent_style.o mime_state.o header_token.o \
71 + verp_sender.o match_parent_style.o mime_state.o header_token.o wildcard_inet_addr.o\
72 strip_addr.o virtual8_maps.o hold_message.o dict_proxy.o mail_dict.o \
74 HDRS = been_here.h bounce.h canon_addr.h cleanup_user.h clnt_stream.h \
76 rewrite_clnt.h sent.h smtp_stream.h split_addr.h string_list.h \
77 sys_exits.h timed_ipc.h tok822.h xtext.h bounce_log.h flush_clnt.h \
78 mbox_conf.h mbox_open.h abounce.h qmqp_proto.h verp_sender.h \
79 - match_parent_style.h quote_flags.h mime_state.h header_token.h \
80 + match_parent_style.h quote_flags.h mime_state.h header_token.h wildcard_inet_addr.h\
81 lex_822.h strip_addr.h virtual8_maps.h hold_message.h dict_proxy.h \
83 TESTSRC = rec2stream.c stream2rec.c recdump.c
84 --- postfix-1.1.2.orig/src/global/mynetworks.c Sun Feb 25 02:46:07 2001
85 +++ postfix-1.1.2/src/global/mynetworks.c Mon Jan 28 12:40:04 2002
88 #include <inet_addr_list.h>
89 #include <name_mask.h>
91 +#include <sys/socket.h>
92 +#include <netinet/in.h>
99 const char *mynetworks(void)
101 static VSTRING *result;
103 + char hbuf[NI_MAXHOST];
107 char *myname = "mynetworks";
113 + struct sockaddr *sa;
116 mask_style = name_mask("mynetworks mask style", mask_styles,
117 var_mynetworks_style);
119 my_mask_list = own_inet_mask_list();
121 for (i = 0; i < my_addr_list->used; i++) {
123 + sa = (struct sockaddr *)&my_addr_list->addrs[i];
124 + if (sa->sa_family != AF_INET) {
125 + if (sa->sa_family == AF_INET6)
126 + vstring_sprintf_append(result, "XAATODOmynetworks ");
129 + addr = ntohl(((struct sockaddr_in *)sa)->sin_addr.s_addr);
130 + mask = ntohl(((struct sockaddr_in *)&my_mask_list->addrs[i])->sin_addr.s_addr);
132 addr = ntohl(my_addr_list->addrs[i].s_addr);
133 mask = ntohl(my_mask_list->addrs[i].s_addr);
136 switch (mask_style) {
139 mask = IN_CLASSD_NET;
140 shift = IN_CLASSD_NSHIFT;
143 + if (getnameinfo(sa, SA_LEN(sa), hbuf, sizeof(hbuf), NULL, 0,
145 + strncpy(hbuf, "???", sizeof(hbuf));
146 + msg_fatal("%s: bad address class: %s", myname, hbuf);
148 msg_fatal("%s: bad address class: %s",
149 myname, inet_ntoa(my_addr_list->addrs[i]));
154 diff -Nur postfix-1.1.2.orig/src/global/own_inet_addr.c postfix-1.1.2/src/global/own_inet_addr.c
155 --- postfix-1.1.2.orig/src/global/own_inet_addr.c Tue Jul 31 20:38:29 2001
156 +++ postfix-1.1.2/src/global/own_inet_addr.c Mon Jan 28 12:40:04 2002
158 #include <netinet/in.h>
159 #include <arpa/inet.h>
162 +#include <sys/socket.h>
166 #ifdef STRCASECMP_IN_STRINGS_H
168 @@ -101,10 +105,11 @@
171 bufp = hosts = mystrdup(var_inet_interfaces);
172 - while ((host = mystrtok(&bufp, sep)) != 0)
173 + while ((host = mystrtok(&bufp, sep)) != 0) {
174 if (inet_addr_host(addr_list, host) == 0)
175 msg_fatal("config variable %s: host not found: %s",
176 VAR_INET_INTERFACES, host);
181 @@ -121,15 +126,39 @@
182 msg_fatal("could not find any active network interfaces");
183 for (nvirtual = 0; nvirtual < addr_list->used; nvirtual++) {
184 for (nlocal = 0; /* see below */ ; nlocal++) {
185 - if (nlocal >= local_addrs.used)
186 + if (nlocal >= local_addrs.used) {
188 + char hbuf[NI_MAXHOST];
189 + if (getnameinfo((struct sockaddr *)&addr_list->addrs[nvirtual],
190 + SS_LEN(addr_list->addrs[nvirtual]), hbuf,
191 + sizeof(hbuf), NULL, 0, NI_NUMERICHOST) != 0)
192 + strncpy(hbuf, "???", sizeof(hbuf));
193 + msg_fatal("parameter %s: no local interface found for %s",
194 + VAR_INET_INTERFACES, hbuf);
196 msg_fatal("parameter %s: no local interface found for %s",
198 inet_ntoa(addr_list->addrs[nvirtual]));
202 + if (addr_list->addrs[nvirtual].ss_family ==
203 + local_addrs.addrs[nlocal].ss_family &&
204 + SS_LEN(addr_list->addrs[nvirtual]) ==
205 + SS_LEN(local_addrs.addrs[nlocal]) &&
206 + memcmp(&addr_list->addrs[nvirtual],
207 + &local_addrs.addrs[nlocal],
208 + SS_LEN(local_addrs.addrs[nlocal])) == 0) {
209 + inet_addr_list_append(mask_list, (struct sockaddr *)&local_masks.addrs[nlocal]);
213 if (addr_list->addrs[nvirtual].s_addr
214 == local_addrs.addrs[nlocal].s_addr) {
215 inet_addr_list_append(mask_list, &local_masks.addrs[nlocal]);
221 inet_addr_list_free(&local_addrs);
224 /* own_inet_addr - is this my own internet address */
227 +int own_inet_addr(struct sockaddr * addr)
232 + struct sockaddr *sa;
234 + if (addr_list.used == 0)
235 + own_inet_addr_init(&addr_list, &mask_list);
237 + for (i = 0; i < addr_list.used; i++) {
238 + sa = (struct sockaddr *)&addr_list.addrs[i];
239 + if (addr->sa_family != sa->sa_family)
241 + switch (addr->sa_family) {
243 + p = (char *)&((struct sockaddr_in *)addr)->sin_addr;
244 + q = (char *)&((struct sockaddr_in *)&addr_list.addrs[i])->sin_addr;
245 + l = sizeof(struct in_addr);
249 + p = (char *)&((struct sockaddr_in6 *)addr)->sin6_addr;
250 + q = (char *)&((struct sockaddr_in6 *)&addr_list.addrs[i])->sin6_addr;
251 + l = sizeof(struct in6_addr);
256 + if (memcmp(p, q, l) == 0)
262 int own_inet_addr(struct in_addr * addr)
266 for (i = 0; i < addr_list.used; i++)
267 if (addr->s_addr == addr_list.addrs[i].s_addr)
273 /* own_inet_addr_list - return list of addresses */
277 /* proxy_inet_addr - is this my proxy internet address */
280 +int proxy_inet_addr(struct sockaddr * addr)
285 + struct sockaddr *sa;
287 + if (*var_proxy_interfaces == 0)
290 + if (proxy_list.used == 0)
291 + proxy_inet_addr_init(&proxy_list);
293 + for (i = 0; i < proxy_list.used; i++) {
294 + sa = (struct sockaddr *)&proxy_list.addrs[i];
295 + if (addr->sa_family != sa->sa_family)
297 + switch (addr->sa_family) {
299 + p = (char *)&((struct sockaddr_in *)addr)->sin_addr;
300 + q = (char *)&((struct sockaddr_in *)&addr_list.addrs[i])->sin_addr;
301 + l = sizeof(struct in_addr);
305 + p = (char *)&((struct sockaddr_in6 *)addr)->sin6_addr;
306 + q = (char *)&((struct sockaddr_in6 *)&addr_list.addrs[i])->sin6_addr;
307 + l = sizeof(struct in6_addr);
312 + if (memcmp(p, q, l) == 0)
318 int proxy_inet_addr(struct in_addr * addr)
327 /* proxy_inet_addr_list - return list of addresses */
329 diff -Nur postfix-1.1.2.orig/src/global/own_inet_addr.h postfix-1.1.2/src/global/own_inet_addr.h
330 --- postfix-1.1.2.orig/src/global/own_inet_addr.h Sat Feb 24 02:25:32 2001
331 +++ postfix-1.1.2/src/global/own_inet_addr.h Mon Jan 28 12:40:04 2002
335 #include <netinet/in.h>
337 +#include <sys/socket.h>
341 * External interface.
344 +extern int own_inet_addr(struct sockaddr *);
346 extern int own_inet_addr(struct in_addr *);
348 extern struct INET_ADDR_LIST *own_inet_addr_list(void);
349 extern struct INET_ADDR_LIST *own_inet_mask_list(void);
351 +extern int proxy_inet_addr(struct sockaddr *);
353 extern int proxy_inet_addr(struct in_addr *);
355 extern struct INET_ADDR_LIST *proxy_inet_addr_list(void);
358 diff -Nur postfix-1.1.2.orig/src/global/peer_name.c postfix-1.1.2/src/global/peer_name.c
359 --- postfix-1.1.2.orig/src/global/peer_name.c Sun Jan 28 16:23:02 2001
360 +++ postfix-1.1.2/src/global/peer_name.c Mon Jan 28 12:40:04 2002
362 PEER_NAME *peer_name(int sock)
364 static PEER_NAME peer;
365 - struct sockaddr_in sin;
366 - SOCKADDR_SIZE len = sizeof(sin);
373 + struct sockaddr peer_un;
374 + struct sockaddr_in peer_un4;
376 + struct sockaddr_in6 peer_un6;
379 +#define sun p_un.peer_un
380 +#define sin p_un.peer_un4
382 +#define sin6 p_un.peer_un6
383 + static char hbuf[NI_MAXHOST];
384 + static char abuf[NI_MAXHOST];
388 + SOCKADDR_SIZE len = sizeof(p_un);
390 - if (getpeername(sock, (struct sockaddr *) & sin, &len) == 0) {
391 - switch (sin.sin_family) {
392 + if (getpeername(sock, (struct sockaddr *)&p_un, &len) == 0) {
393 + switch (p_un.peer_un.sa_family) {
396 peer.type = PEER_TYPE_INET;
397 hp = gethostbyaddr((char *) &(sin.sin_addr),
399 hp->h_name : "unknown");
400 peer.addr = inet_ntoa(sin.sin_addr);
404 + peer.type = PEER_TYPE_INET;
405 + if (getnameinfo(&sun, len, hbuf, sizeof(hbuf), NULL, 0, NI_NAMEREQD) != 0)
406 + peer.name = "unknown";
412 + peer.type = PEER_TYPE_INET6;
413 + if (getnameinfo(&sun, len, hbuf, sizeof(hbuf), NULL, 0, NI_NAMEREQD) != 0)
414 + peer.name = "unknown";
422 peer.type = PEER_TYPE_LOCAL;
423 diff -Nur postfix-1.1.2.orig/src/global/peer_name.h postfix-1.1.2/src/global/peer_name.h
424 --- postfix-1.1.2.orig/src/global/peer_name.h Fri Dec 11 19:55:32 1998
425 +++ postfix-1.1.2/src/global/peer_name.h Mon Jan 28 12:40:04 2002
427 #define PEER_TYPE_UNKNOWN 0
428 #define PEER_TYPE_INET 1
429 #define PEER_TYPE_LOCAL 2
431 +#define PEER_TYPE_INET6 3
434 extern PEER_NAME *peer_name(int);
436 diff -Nur postfix-1.1.2.orig/src/global/resolve_local.c postfix-1.1.2/src/global/resolve_local.c
437 --- postfix-1.1.2.orig/src/global/resolve_local.c Fri Jan 18 15:06:51 2002
438 +++ postfix-1.1.2/src/global/resolve_local.c Mon Jan 28 12:40:04 2002
440 #include <netinet/in.h>
441 #include <arpa/inet.h>
446 #define INADDR_NONE 0xffffffff
449 char *saved_addr = mystrdup(addr);
452 + struct addrinfo hints, *res, *res0;
455 struct in_addr ipaddr;
459 #define RETURN(x) { myfree(saved_addr); return(x); }
461 if (*dest == '[' && dest[len - 1] == ']') {
465 + memset(&hints, 0, sizeof(hints));
466 + hints.ai_family = PF_UNSPEC;
467 + hints.ai_socktype = SOCK_DGRAM;
468 + error = getaddrinfo(dest, NULL, &hints, &res0);
470 + for (res = res0; res; res = res->ai_next) {
471 + if (own_inet_addr(res->ai_addr)) {
472 + freeaddrinfo(res0);
476 + freeaddrinfo(res0);
479 if ((ipaddr.s_addr = inet_addr(dest)) != INADDR_NONE
480 && (own_inet_addr(&ipaddr) || proxy_inet_addr(&ipaddr)))
486 diff -Nur postfix-1.1.2.orig/src/global/wildcard_inet_addr.c postfix-1.1.2/src/global/wildcard_inet_addr.c
487 --- postfix-1.1.2.orig/src/global/wildcard_inet_addr.c Thu Jan 1 01:00:00 1970
488 +++ postfix-1.1.2/src/global/wildcard_inet_addr.c Mon Jan 28 12:40:04 2002
490 +/* System library. */
492 +#include <sys_defs.h>
493 +#include <netinet/in.h>
494 +#include <arpa/inet.h>
497 +#include <sys/socket.h>
501 +#ifdef STRCASECMP_IN_STRINGS_H
502 +#include <strings.h>
505 +/* Utility library. */
508 +#include <mymalloc.h>
509 +#include <inet_addr_list.h>
510 +#include <inet_addr_local.h>
511 +#include <inet_addr_host.h>
512 +#include <stringops.h>
514 +/* Global library. */
516 +#include <mail_params.h>
517 +#include <wildcard_inet_addr.h>
519 +/* Application-specific. */
520 +static INET_ADDR_LIST addr_list;
522 +/* wildcard_inet_addr_init - initialize my own address list */
524 +static void wildcard_inet_addr_init(INET_ADDR_LIST *addr_list)
527 + struct addrinfo hints, *res, *res0;
528 + char hbuf[NI_MAXHOST];
530 +#ifdef NI_WITHSCOPEID
531 + const int niflags = NI_NUMERICHOST | NI_WITHSCOPEID;
533 + const int niflags = NI_NUMERICHOST;
536 + inet_addr_list_init(addr_list);
538 + memset(&hints, 0, sizeof(hints));
539 + hints.ai_family = PF_UNSPEC;
540 + hints.ai_socktype = SOCK_STREAM;
541 + hints.ai_flags = AI_PASSIVE;
542 + error = getaddrinfo(NULL, "0", &hints, &res0);
544 + msg_fatal("could not get list of wildcard addresses");
545 + for (res = res0; res; res = res->ai_next) {
546 + if (res->ai_family != AF_INET && res->ai_family != AF_INET6)
548 + if (getnameinfo(res->ai_addr, res->ai_addrlen, hbuf, sizeof(hbuf),
549 + NULL, 0, niflags) != 0)
551 + if (inet_addr_host(addr_list, hbuf) == 0)
552 + continue; /* msg_fatal("config variable %s: host not found: %s",
553 + VAR_INET_INTERFACES, hbuf); */
555 + freeaddrinfo(res0);
557 + if (inet_addr_host(addr_list, "0.0.0.0") == 0)
558 + msg_fatal("config variable %s: host not found: %s",
559 + VAR_INET_INTERFACES, "0.0.0.0");
563 +/* wildcard_inet_addr_list - return list of addresses */
565 +INET_ADDR_LIST *wildcard_inet_addr_list(void)
567 + if (addr_list.used == 0)
568 + wildcard_inet_addr_init(&addr_list);
570 + return (&addr_list);
572 diff -Nur postfix-1.1.2.orig/src/global/wildcard_inet_addr.h postfix-1.1.2/src/global/wildcard_inet_addr.h
573 --- postfix-1.1.2.orig/src/global/wildcard_inet_addr.h Thu Jan 1 01:00:00 1970
574 +++ postfix-1.1.2/src/global/wildcard_inet_addr.h Mon Jan 28 12:40:04 2002
576 +#ifndef _WILDCARD_INET_ADDR_H_INCLUDED_
577 +#define _WILDCARD_INET_ADDR_H_INCLUDED_
581 +/* wildcard_inet_addr_list 3h
583 +/* grab the list of wildcard IP addresses.
585 +/* #include <own_inet_addr.h>
593 +#include <netinet/in.h>
595 +#include <sys/socket.h>
599 + * External interface.
601 +extern struct INET_ADDR_LIST *wildcard_inet_addr_list(void);
608 +/* Jun-ichiro itojun Hagino
612 diff -Nur postfix-1.1.2.orig/src/master/master_ent.c postfix-1.1.2/src/master/master_ent.c
613 --- postfix-1.1.2.orig/src/master/master_ent.c Sun Dec 23 20:08:58 2001
614 +++ postfix-1.1.2/src/master/master_ent.c Mon Jan 28 12:40:04 2002
616 inet_addr_host(MASTER_INET_ADDRLIST(serv), host);
617 serv->listen_fd_count = MASTER_INET_ADDRLIST(serv)->used;
618 } else if (strcasecmp(var_inet_interfaces, DEF_INET_INTERFACES) == 0) {
620 + MASTER_INET_ADDRLIST(serv) = wildcard_inet_addr_list();
621 + serv->listen_fd_count = MASTER_INET_ADDRLIST(serv)->used;
623 MASTER_INET_ADDRLIST(serv) = 0; /* wild-card */
624 serv->listen_fd_count = 1;
627 MASTER_INET_ADDRLIST(serv) = own_inet_addr_list(); /* virtual */
628 serv->listen_fd_count = MASTER_INET_ADDRLIST(serv)->used;
629 diff -Nur postfix-1.1.2.orig/src/master/master_listen.c postfix-1.1.2/src/master/master_listen.c
630 --- postfix-1.1.2.orig/src/master/master_listen.c Tue May 1 00:47:57 2001
631 +++ postfix-1.1.2/src/master/master_listen.c Mon Jan 28 12:40:04 2002
641 /* master_listen_init - enable connection requests */
643 void master_listen_init(MASTER_SERV *serv)
645 char *myname = "master_listen_init";
650 + char hbuf[NI_MAXHOST];
651 + SOCKADDR_SIZE salen;
655 * Find out what transport we should use, then create one or more
656 @@ -111,18 +120,31 @@
658 inet_listen(MASTER_INET_PORT(serv),
659 serv->max_proc > var_proc_limit ?
660 - serv->max_proc : var_proc_limit, NON_BLOCKING);
661 + serv->max_proc : var_proc_limit, NON_BLOCKING, 1);
662 close_on_exec(serv->listen_fd[0], CLOSE_ON_EXEC);
663 } else { /* virtual or host:port */
664 - for (n = 0; n < serv->listen_fd_count; n++) {
665 + for (m = n = 0; n < serv->listen_fd_count; n++) {
667 + if (getnameinfo((struct sockaddr *)&MASTER_INET_ADDRLIST(serv)->addrs[n],
668 + SA_LEN((struct sockaddr *)&MASTER_INET_ADDRLIST(serv)->addrs[n]),
669 + hbuf, sizeof(hbuf), NULL, 0, NI_NUMERICHOST)) {
670 + strncpy(hbuf, "?????", sizeof(hbuf));
672 + end_point = concatenate(hbuf, ":", MASTER_INET_PORT(serv), (char *) 0);
674 end_point = concatenate(inet_ntoa(MASTER_INET_ADDRLIST(serv)->addrs[n]),
675 ":", MASTER_INET_PORT(serv), (char *) 0);
679 = inet_listen(end_point, serv->max_proc > var_proc_limit ?
680 - serv->max_proc : var_proc_limit, NON_BLOCKING);
681 - close_on_exec(serv->listen_fd[n], CLOSE_ON_EXEC);
682 + serv->max_proc : var_proc_limit, NON_BLOCKING, 0);
684 + serv->listen_fd[m] = tmpfd;
685 + close_on_exec(serv->listen_fd[m++], CLOSE_ON_EXEC);
689 + serv->listen_fd_count=m;
693 diff -Nur postfix-1.1.2.orig/src/qmgr/qmgr_message.c postfix-1.1.2/src/qmgr/qmgr_message.c
694 --- postfix-1.1.2.orig/src/qmgr/qmgr_message.c Sat Jul 14 15:08:57 2001
695 +++ postfix-1.1.2/src/qmgr/qmgr_message.c Mon Jan 28 12:40:04 2002
697 * every front-ent program.
699 if ((at = strrchr(recipient->address, '@')) != 0
701 + && (at + 1)[strspn(at + 1, "[]0123456789.:abcdef")] != 0
703 && (at + 1)[strspn(at + 1, "[]0123456789.")] != 0
705 && valid_hostname(at + 1, DONT_GRIPE) == 0) {
706 qmgr_bounce_recipient(message, recipient,
707 "bad host/domain syntax: \"%s\"", at + 1);
708 diff -Nur postfix-1.1.2.orig/src/smtp/Makefile.in postfix-1.1.2/src/smtp/Makefile.in
709 --- postfix-1.1.2.orig/src/smtp/Makefile.in Mon Jan 28 12:38:34 2002
710 +++ postfix-1.1.2/src/smtp/Makefile.in Mon Jan 28 12:40:04 2002
712 smtp_connect.o: ../../include/mail_params.h
713 smtp_connect.o: ../../include/own_inet_addr.h
714 smtp_connect.o: ../../include/dns.h
715 +smtp_connect.o: ../../include/get_port.h
716 smtp_connect.o: smtp.h
717 smtp_connect.o: ../../include/argv.h
718 smtp_connect.o: ../../include/deliver_request.h
719 diff -Nur postfix-1.1.2.orig/src/smtp/smtp_addr.c postfix-1.1.2/src/smtp/smtp_addr.c
720 --- postfix-1.1.2.orig/src/smtp/smtp_addr.c Sun Jul 8 17:05:26 2001
721 +++ postfix-1.1.2/src/smtp/smtp_addr.c Mon Jan 28 12:40:04 2002
722 @@ -134,18 +134,68 @@
723 static void smtp_print_addr(char *what, DNS_RR *addr_list)
726 - struct in_addr in_addr;
728 + struct sockaddr_storage ss;
730 + struct sockaddr ss;
732 + struct sockaddr_in *sin;
734 + struct sockaddr_in6 *sin6;
735 + char hbuf[NI_MAXHOST];
737 + char hbuf[sizeof("255.255.255.255") + 1];
740 msg_info("begin %s address list", what);
741 for (addr = addr_list; addr; addr = addr->next) {
742 - if (addr->data_len > sizeof(addr)) {
743 - msg_warn("skipping address length %d", addr->data_len);
745 - memcpy((char *) &in_addr, addr->data, sizeof(in_addr));
746 - msg_info("pref %4d host %s/%s",
747 - addr->pref, addr->name,
748 - inet_ntoa(in_addr));
749 + if (addr->class != C_IN) {
750 + msg_warn("skipping unsupported address (class=%u)", addr->class);
753 + switch (addr->type) {
755 + if (addr->data_len != sizeof(sin->sin_addr)) {
756 + msg_warn("skipping invalid address (AAAA, len=%u)",
760 + sin = (struct sockaddr_in *)&ss;
761 + memset(sin, 0, sizeof(*sin));
762 + sin->sin_family = AF_INET;
764 + sin->sin_len = sizeof(*sin);
766 + memcpy(&sin->sin_addr, addr->data, sizeof(sin->sin_addr));
770 + if (addr->data_len != sizeof(sin6->sin6_addr)) {
771 + msg_warn("skipping invalid address (AAAA, len=%u)",
775 + sin6 = (struct sockaddr_in6 *)&ss;
776 + memset(sin6, 0, sizeof(*sin6));
777 + sin6->sin6_family = AF_INET6;
779 + sin6->sin6_len = sizeof(*sin6);
781 + memcpy(&sin6->sin6_addr, addr->data, sizeof(sin6->sin6_addr));
785 + msg_warn("skipping unsupported address (type=%u)", addr->type);
790 + (void)getnameinfo((struct sockaddr *)&ss, SS_LEN(ss),
791 + hbuf, sizeof(hbuf), NULL, 0, NI_NUMERICHOST);
793 + (void)inet_ntop(AF_INET, &sin->sin_addr, hbuf, sizeof(hbuf));
795 + msg_info("pref %4d host %s/%s", addr->pref, addr->name, hbuf);
797 msg_info("end %s address list", what);
799 @@ -155,15 +205,23 @@
800 static DNS_RR *smtp_addr_one(DNS_RR *addr_list, char *host, unsigned pref, VSTRING *why)
802 char *myname = "smtp_addr_one";
804 struct in_addr inaddr;
810 + struct addrinfo hints, *res0, *res;
818 msg_info("%s: host %s", myname, host);
822 * Interpret a numerical name as an address.
825 smtp_errno = SMTP_FAIL;
829 + memset(&hints, 0, sizeof(hints));
830 + hints.ai_family = PF_UNSPEC;
831 + hints.ai_socktype = SOCK_STREAM;
832 + error = getaddrinfo(host, NULL, &hints, &res0);
836 + smtp_errno = SMTP_RETRY;
839 + vstring_sprintf(why, "[%s]: %s",host,gai_strerror(error));
840 + smtp_errno = SMTP_FAIL;
843 + return (addr_list);
845 + for (res = res0; res; res = res->ai_next) {
846 + memset((char *) &fixed, 0, sizeof(fixed));
847 + switch(res->ai_family) {
849 + /* XXX not scope friendly */
850 + fixed.type = T_AAAA;
851 + addr = (char *)&((struct sockaddr_in6 *)res->ai_addr)->sin6_addr;
852 + addrlen = sizeof(struct in6_addr);
856 + addr = (char *)&((struct sockaddr_in *)res->ai_addr)->sin_addr;
857 + addrlen = sizeof(struct in_addr);
860 + msg_warn("%s: unknown address family %d for %s",
861 + myname, res->ai_family, host);
864 + addr_list = dns_rr_append(addr_list,
865 + dns_rr_create(host, &fixed, pref, addr, addrlen));
868 + freeaddrinfo(res0);
874 INET_ADDR_LIST *self;
878 + struct sockaddr *sa;
882 * Find the first address that lists any address that this mail system is
883 @@ -260,12 +363,36 @@
885 self = own_inet_addr_list();
886 for (addr = addr_list; addr; addr = addr->next) {
887 - for (i = 0; i < self->used; i++)
888 + for (i = 0; i < self->used; i++) {
890 + sa = (struct sockaddr *)&self->addrs[i];
891 + switch(addr->type) {
894 + if (sa->sa_family != AF_INET6)
896 + if (memcmp(&((struct sockaddr_in6 *)sa)->sin6_addr,
897 + addr->data, sizeof(struct in6_addr)) == 0) {
902 + if (sa->sa_family != AF_INET)
904 + if (memcmp(&((struct sockaddr_in *)sa)->sin_addr,
905 + addr->data, sizeof(struct in_addr)) == 0) {
911 if (INADDRP(addr->data)->s_addr == self->addrs[i].s_addr) {
913 msg_info("%s: found at pref %d", myname, addr->pref);
921 diff -Nur postfix-1.1.2.orig/src/smtp/smtp_connect.c postfix-1.1.2/src/smtp/smtp_connect.c
922 --- postfix-1.1.2.orig/src/smtp/smtp_connect.c Mon Jan 28 12:38:34 2002
923 +++ postfix-1.1.2/src/smtp/smtp_connect.c Mon Jan 28 12:40:04 2002
925 /* System library. */
927 #include <sys_defs.h>
929 #include <sys/socket.h>
930 #include <netinet/in.h>
931 #include <arpa/inet.h>
933 #include <inet_addr_list.h>
935 #include <timed_connect.h>
936 +#include <get_port.h>
937 #include <stringops.h>
938 #include <host_port.h>
940 @@ -134,19 +136,45 @@
943 char *myname = "smtp_connect_addr";
944 - struct sockaddr_in sin;
947 + struct sockaddr_storage ss;
949 + struct sockaddr ss;
951 + struct sockaddr *sa;
952 + struct sockaddr_in *sin;
954 + struct sockaddr_in6 *sin6;
956 + SOCKADDR_SIZE salen;
958 + char hbuf[NI_MAXHOST];
960 + char hbuf[sizeof("255.255.255.255") + 1];
963 INET_ADDR_LIST *addr_list;
968 - unsigned long inaddr;
970 + sa = (struct sockaddr *)&ss;
971 + sin = (struct sockaddr_in *)&ss;
973 + sin6 = (struct sockaddr_in6 *)&ss;
979 - if (addr->data_len > sizeof(sin.sin_addr)) {
981 + if (((addr->type==T_A) && (addr->data_len > sizeof(sin->sin_addr))) ||
982 + ((addr->type==T_AAAA) && (addr->data_len > sizeof(sin6->sin6_addr))))
984 + if (addr->data_len > sizeof(sin->sin_addr))
987 msg_warn("%s: skip address with length %d", myname, addr->data_len);
988 smtp_errno = SMTP_RETRY;
990 @@ -155,17 +183,39 @@
994 - memset((char *) &sin, 0, sizeof(sin));
995 - sin.sin_family = AF_INET;
997 - if ((sock = socket(sin.sin_family, SOCK_STREAM, 0)) < 0)
998 - msg_fatal("%s: socket: %m", myname);
1000 + switch (addr->type) {
1003 + memset(sin6, 0, sizeof(*sin6));
1004 + sin6->sin6_family = AF_INET6;
1005 + salen = sizeof(*sin6);
1008 + default: /* T_A: */
1009 + memset(sin, 0, sizeof(*sin));
1010 + sin->sin_family = AF_INET;
1011 + salen = sizeof(*sin);
1015 + sa->sa_len = salen;
1017 + if ((sock = socket(sa->sa_family, SOCK_STREAM, 0)) < 0)
1018 + msg_warn("%s: socket: %m", myname);
1021 * Allow the sysadmin to specify the source address, for example, as "-o
1022 * smtp_bind_address=x.x.x.x" in the master.cf file.
1024 if (*var_smtp_bind_addr) {
1026 + struct sockaddr_in sin;
1028 + memset(&sin, 0, sizeof(sin));
1029 + sin.sin_family = AF_INET;
1031 + sin.sin_len = sizeof(sin);
1033 sin.sin_addr.s_addr = inet_addr(var_smtp_bind_addr);
1034 if (sin.sin_addr.s_addr == INADDR_NONE)
1035 msg_fatal("%s: bad %s parameter: %s",
1036 @@ -174,6 +224,25 @@
1037 msg_warn("%s: bind %s: %m", myname, inet_ntoa(sin.sin_addr));
1039 msg_info("%s: bind %s", myname, inet_ntoa(sin.sin_addr));
1041 + char hbufl[NI_MAXHOST];
1042 + struct addrinfo hints, *res;
1044 + memset(&hints, 0, sizeof(hints));
1045 + hints.ai_family = sa->sa_family;
1046 + hints.ai_socktype = SOCK_STREAM;
1047 + hints.ai_flags = AI_PASSIVE|AI_NUMERICHOST;
1048 + snprintf(hbufl, sizeof(hbufl)-1, "%s", var_smtp_bind_addr);
1049 + if (getaddrinfo(hbufl, NULL, &hints, &res) == 0) {
1050 + (void)getnameinfo(res->ai_addr, res->ai_addrlen, hbufl,
1051 + sizeof(hbufl), NULL, 0, NI_NUMERICHOST);
1052 + if (bind(sock, res->ai_addr, res->ai_addrlen) < 0)
1053 + msg_warn("%s: bind %s: %m", myname, hbufl);
1054 + freeaddrinfo(res);
1056 + msg_info("%s: bind %s", myname, hbufl);
1062 @@ -181,8 +250,17 @@
1063 * the mail appears to come from the "right" machine address.
1065 else if ((addr_list = own_inet_addr_list())->used == 1) {
1067 + struct sockaddr_in sin;
1068 + unsigned long inaddr; /*XXX BAD!*/
1070 + memset(&sin, 0, sizeof(sin));
1071 + sin.sin_family = AF_INET;
1073 + sin.sin_len = sizeof(sin);
1075 memcpy((char *) &sin.sin_addr, addr_list->addrs, sizeof(sin.sin_addr));
1076 - inaddr = ntohl(sin.sin_addr.s_addr);
1077 + inaddr = (unsigned long)ntohl(sin.sin_addr.s_addr);
1078 if (!IN_CLASSA(inaddr)
1079 || !(((inaddr & IN_CLASSA_NET) >> IN_CLASSA_NSHIFT) == IN_LOOPBACKNET)) {
1080 if (bind(sock, (struct sockaddr *) & sin, sizeof(sin)) < 0)
1081 @@ -190,30 +268,85 @@
1083 msg_info("%s: bind %s", myname, inet_ntoa(sin.sin_addr));
1086 + char hbufl[NI_MAXHOST];
1087 + struct addrinfo hints, *res = NULL, *loopback = NULL;
1089 + memset(&hints, 0, sizeof(hints));
1090 + hints.ai_family = sa->sa_family;
1091 + hints.ai_socktype = SOCK_STREAM;
1092 + if (getaddrinfo(NULL, "0", &hints, &loopback) != 0)
1096 + * getnameinfo -> getaddrinfo loop is here so that we can
1097 + * get rid of port.
1099 + (void)getnameinfo((struct sockaddr *)addr_list->addrs, SA_LEN((struct sockaddr *)addr_list->addrs),
1100 + hbufl, sizeof(hbufl), NULL, 0, NI_NUMERICHOST);
1101 + hbufl[sizeof(hbufl)-1] = 0;
1102 + memset(&hints, 0, sizeof(hints));
1103 + hints.ai_family = sa->sa_family;
1104 + hints.ai_socktype = SOCK_STREAM;
1105 + hints.ai_flags = AI_PASSIVE|AI_NUMERICHOST;
1106 + if (getaddrinfo(hbufl, NULL, &hints, &res) == 0 &&
1107 + !(res->ai_addrlen == loopback->ai_addrlen &&
1108 + memcmp(res->ai_addr, loopback->ai_addr, res->ai_addrlen) == 0)) {
1109 + if (bind(sock, res->ai_addr, res->ai_addrlen) < 0)
1110 + msg_warn("%s: bind %s: %m", myname, hbufl);
1112 + msg_info("%s: bind %s", myname, hbufl);
1115 + freeaddrinfo(res);
1117 + freeaddrinfo(loopback);
1122 * Connect to the SMTP server.
1124 - sin.sin_port = port;
1125 - memcpy((char *) &sin.sin_addr, addr->data, sizeof(sin.sin_addr));
1126 + switch (addr->type) {
1129 + /* XXX scope unfriendly */
1130 + memset(sin6, 0, sizeof(*sin6));
1131 + sin6->sin6_port = port;
1132 + sin6->sin6_family = AF_INET6;
1133 + salen = sizeof(*sin6);
1134 + memcpy(&sin6->sin6_addr, addr->data, sizeof(sin6->sin6_addr));
1135 + inet_ntop(AF_INET6, &sin6->sin6_addr, hbuf, sizeof(hbuf));
1138 + default: /* T_A */
1139 + memset(sin, 0, sizeof(*sin));
1140 + sin->sin_port = port;
1141 + sin->sin_family = AF_INET;
1142 + salen = sizeof(*sin);
1143 + memcpy(&sin->sin_addr, addr->data, sizeof(sin->sin_addr));
1144 + inet_ntop(AF_INET, &sin->sin_addr, hbuf, sizeof(hbuf));
1148 + sa->sa_len = salen;
1152 msg_info("%s: trying: %s[%s] port %d...",
1153 - myname, addr->name, inet_ntoa(sin.sin_addr), ntohs(port));
1154 + myname, addr->name, hbuf, ntohs(port));
1155 if (var_smtp_conn_tmout > 0) {
1156 non_blocking(sock, NON_BLOCKING);
1157 - conn_stat = timed_connect(sock, (struct sockaddr *) & sin,
1158 - sizeof(sin), var_smtp_conn_tmout);
1159 + conn_stat = timed_connect(sock, sa, salen, var_smtp_conn_tmout);
1160 saved_errno = errno;
1161 non_blocking(sock, BLOCKING);
1162 errno = saved_errno;
1164 - conn_stat = connect(sock, (struct sockaddr *) & sin, sizeof(sin));
1165 + conn_stat = connect(sock, sa, salen);
1167 if (conn_stat < 0) {
1168 vstring_sprintf(why, "connect to %s[%s]: %m",
1169 - addr->name, inet_ntoa(sin.sin_addr));
1170 + addr->name, hbuf);
1171 smtp_errno = SMTP_RETRY;
1175 * Skip this host if it takes no action within some time limit.
1177 if (read_wait(sock, var_smtp_helo_tmout) < 0) {
1178 - vstring_sprintf(why, "connect to %s[%s]: read timeout",
1179 - addr->name, inet_ntoa(sin.sin_addr));
1180 + vstring_sprintf(why, "connect to %s [%s]: read timeout",
1181 + addr->name, hbuf);
1182 smtp_errno = SMTP_RETRY;
1185 diff -Nur postfix-1.1.2.orig/src/smtp/smtp_unalias.c postfix-1.1.2/src/smtp/smtp_unalias.c
1186 --- postfix-1.1.2.orig/src/smtp/smtp_unalias.c Thu Sep 28 19:06:09 2000
1187 +++ postfix-1.1.2/src/smtp/smtp_unalias.c Mon Jan 28 12:40:04 2002
1189 if ((result = htable_find(cache, name)) == 0) {
1190 fqdn = vstring_alloc(10);
1191 if (dns_lookup_types(name, smtp_unalias_flags, (DNS_RR **) 0,
1192 - fqdn, (VSTRING *) 0, T_MX, T_A, 0) != DNS_OK)
1193 + fqdn, (VSTRING *) 0, T_MX, T_A,
1198 vstring_strcpy(fqdn, name);
1199 htable_enter(cache, name, result = vstring_export(fqdn));
1201 diff -Nur postfix-1.1.2.orig/src/smtpd/smtpd_check.c postfix-1.1.2/src/smtpd/smtpd_check.c
1202 --- postfix-1.1.2.orig/src/smtpd/smtpd_check.c Mon Jan 28 12:38:34 2002
1203 +++ postfix-1.1.2/src/smtpd/smtpd_check.c Mon Jan 28 12:40:04 2002
1204 @@ -1187,6 +1195,49 @@
1206 static int has_my_addr(const char *host)
1209 + char *myname = "has_my_addr";
1210 + struct addrinfo hints, *res, *res0;
1212 + char hbuf[NI_MAXHOST];
1215 + msg_info("%s: host %s", myname, host);
1218 + * If we can't lookup the host, play safe and assume it is OK.
1223 + memset(&hints, 0, sizeof(hints));
1224 + hints.ai_family = PF_UNSPEC;
1225 + hints.ai_socktype = SOCK_DGRAM;
1226 + error = getaddrinfo(host, NULL, &hints, &res0);
1229 + msg_info("%s: host %s: %s", myname, host, gai_strerror(error));
1232 + for (res = res0; res; res = res->ai_next) {
1233 + if (msg_verbose) {
1234 + if (getnameinfo(res->ai_addr, res->ai_addrlen, hbuf, sizeof(hbuf),
1235 + NULL, 0, NI_NUMERICHOST)) {
1236 + strncpy(hbuf, "???", sizeof(hbuf));
1238 + msg_info("%s: addr %s", myname, hbuf);
1240 + if (own_inet_addr(res->ai_addr)) {
1241 + freeaddrinfo(res0);
1245 + freeaddrinfo(res0);
1247 + msg_info("%s: host %s: no match", myname, host);
1251 char *myname = "has_my_addr";
1252 struct in_addr addr;
1254 @@ -1222,6 +1273,7 @@
1255 msg_info("%s: host %s: no match", myname, host);
1261 /* i_am_mx - is this machine listed as MX relay */
1262 @@ -1647,11 +1699,28 @@
1263 #define CHK_ADDR_RETURN(x,y) { *found = y; return(x); }
1265 addr = STR(vstring_strcpy(error_text, address));
1268 + if (strncmp(addr, "::ffff:", 7) == 0 && msg_verbose)
1269 + msg_info("%s: %s v6 addr in v4 compat-mode, "
1270 + "converted to v4 for map checking compatibility (%s)", \
1271 + myname, addr, addr+7);
1274 if ((dict = dict_handle(table)) == 0)
1275 msg_panic("%s: dictionary not found: %s", myname, table);
1277 if (flags == 0 || (flags & dict->flags) != 0) {
1279 + if (strncmp(addr, "::ffff:", 7) == 0) {
1280 + /* try if ::ffff: formati is present in map, if not, try
1281 + traditional IPv4 format striping :ffff: part */
1282 + if ((value = dict_get(dict, addr)) != 0 || \
1283 + (value = dict_get(dict, addr+7)) != 0)
1284 + CHK_ADDR_RETURN(check_table_result(state, table, value, address,
1285 + reply_name, reply_class,
1289 if ((value = dict_get(dict, addr)) != 0)
1290 CHK_ADDR_RETURN(check_table_result(state, table, value, address,
1291 reply_name, reply_class,
1292 @@ -2406,12 +2468,23 @@
1294 msg_info("%s: %s %s", myname, reply_class, addr);
1297 - * IPv4 only for now
1301 + /* IPv4 only for now */
1302 if (inet_pton(AF_INET, addr, &a) != 1)
1303 return SMTPD_CHECK_DUNNO;
1304 + octets = argv_split(state->addr, ".");
1306 + /* IPv4 and IPv6-mapped IPv4 only for now */
1307 + if (inet_pton(AF_INET, state->addr, &a) == 1)
1308 + octets = argv_split(state->addr, ".");
1310 + struct in6_addr a6;
1311 + if (inet_pton(AF_INET6, state->addr, &a6) != 1)
1312 + return SMTPD_CHECK_DUNNO;
1313 + if (!IN6_IS_ADDR_V4MAPPED(&a6) || (strrchr(state->addr,':') == NULL))
1314 + return SMTPD_CHECK_DUNNO;
1315 + octets = argv_split(strrchr(state->addr,':')+1, ".");
1320 diff -Nur postfix-1.1.2.orig/src/smtpd/smtpd_peer.c postfix-1.1.2/src/smtpd/smtpd_peer.c
1321 --- postfix-1.1.2.orig/src/smtpd/smtpd_peer.c Thu Jul 5 22:09:47 2001
1322 +++ postfix-1.1.2/src/smtpd/smtpd_peer.c Mon Jan 28 12:40:04 2002
1327 +/* Utility library. */
1330 +#include <mymalloc.h>
1331 +#include <valid_hostname.h>
1332 +#include <stringops.h>
1334 +/* Global library. */
1337 * Older systems don't have h_errno. Even modern systems don't have
1343 -/* Utility library. */
1346 -#include <mymalloc.h>
1347 -#include <valid_hostname.h>
1348 -#include <stringops.h>
1350 -/* Global library. */
1354 +#define GAI_STRERROR(error) \
1355 + ((error = EAI_SYSTEM) ? gai_strerror(error) : strerror(errno))
1358 /* Application-specific. */
1361 @@ -102,10 +106,18 @@
1363 void smtpd_peer_init(SMTPD_STATE *state)
1365 - struct sockaddr_in sin;
1366 - SOCKADDR_SIZE len = sizeof(sin);
1368 + struct sockaddr_storage ss;
1370 + struct sockaddr ss;
1371 + struct in_addr *in;
1375 + struct sockaddr *sa;
1376 + SOCKADDR_SIZE len;
1378 + sa = (struct sockaddr *)&ss;
1382 * Avoid suprious complaints from Purify on Solaris.
1385 * Look up the peer address information.
1387 - if (getpeername(vstream_fileno(state->client),
1388 - (struct sockaddr *) & sin, &len) >= 0) {
1389 + if (getpeername(vstream_fileno(state->client), sa, &len) >= 0) {
1393 @@ -132,23 +143,56 @@
1395 * Look up and "verify" the client hostname.
1397 - else if (errno == 0 && sin.sin_family == AF_INET) {
1398 - state->addr = mystrdup(inet_ntoa(sin.sin_addr));
1399 - hp = gethostbyaddr((char *) &(sin.sin_addr),
1400 - sizeof(sin.sin_addr), AF_INET);
1402 + else if (errno == 0 && (sa->sa_family == AF_INET
1404 + || sa->sa_family == AF_INET6
1408 + char hbuf[NI_MAXHOST];
1409 + char abuf[NI_MAXHOST];
1410 + struct addrinfo hints, *rnull = NULL;
1412 + char abuf[sizeof("255.255.255.255") + 1];
1418 + (void)getnameinfo(sa, len, abuf, sizeof(hbuf), NULL, 0, NI_NUMERICHOST);
1420 + in = &((struct sockaddr_in *)sa)->sin_addr;
1421 + inet_ntop(AF_INET, in, abuf, sizeof(hbuf));
1423 + state->addr = mystrdup(abuf);
1425 + error = getnameinfo(sa, len, hbuf, sizeof(hbuf), NULL, 0, NI_NAMEREQD);
1428 + hp = gethostbyaddr((char *)in, sizeof(*in), AF_INET);
1431 + hbuf = mystrdup(hp->h_name);
1436 state->name = mystrdup("unknown");
1438 + state->peer_code = (error == EAI_AGAIN ? 4 : 5);
1440 state->peer_code = (h_errno == TRY_AGAIN ? 4 : 5);
1441 - } else if (valid_hostaddr(hp->h_name, DONT_GRIPE)) {
1443 + } else if (valid_hostaddr(hbuf, DONT_GRIPE)) {
1444 msg_warn("numeric result %s in address->name lookup for %s",
1445 - hp->h_name, state->addr);
1446 + hp->hbuf, state->addr);
1447 state->name = mystrdup("unknown");
1448 state->peer_code = 5;
1449 - } else if (!valid_hostname(hp->h_name, DONT_GRIPE)) {
1450 + } else if (!valid_hostname(hbuf, DONT_GRIPE)) {
1451 state->name = mystrdup("unknown");
1452 state->peer_code = 5;
1454 - state->name = mystrdup(hp->h_name); /* hp->name is clobbered!! */
1455 + state->name = mystrdup(hp->hbuf); /* hp->name is clobbered!! */
1456 state->peer_code = 2;
1459 @@ -150,16 +194,31 @@
1460 state->peer_code = code; \
1464 + memset(&hints, 0, sizeof(hints));
1465 + hints.ai_family = AF_UNSPEC;
1466 + hints.ai_socktype = SOCK_STREAM;
1467 + error = getaddrinfo(state->name, NULL, &hints, &rnull);
1469 + msg_warn("%s: hostname %s verification failed: %s",
1470 + state->addr, state->name, GAI_STRERROR(error));
1471 + REJECT_PEER_NAME(state, (error == EAI_AGAIN ? 4 : 5));
1473 + /* memcmp() isn't needed if we use getaddrinfo */
1475 + freeaddrinfo(rnull);
1477 hp = gethostbyname(state->name); /* clobbers hp->name!! */
1479 msg_warn("%s: hostname %s verification failed: %s",
1480 state->addr, state->name, HSTRERROR(h_errno));
1481 REJECT_PEER_NAME(state, (h_errno == TRY_AGAIN ? 4 : 5));
1482 - } else if (hp->h_length != sizeof(sin.sin_addr)) {
1483 + } else if (hp->h_length != sizeof(*in)) {
1484 msg_warn("%s: hostname %s verification failed: bad address size %d",
1485 state->addr, state->name, hp->h_length);
1486 REJECT_PEER_NAME(state, 5);
1489 for (i = 0; /* void */ ; i++) {
1490 if (hp->h_addr_list[i] == 0) {
1491 msg_warn("%s: address not listed for hostname %s",
1492 @@ -167,12 +226,11 @@
1493 REJECT_PEER_NAME(state, 5);
1496 - if (memcmp(hp->h_addr_list[i],
1497 - (char *) &sin.sin_addr,
1498 - sizeof(sin.sin_addr)) == 0)
1499 + if (memcmp(hp->h_addr_list[i], (char *)in, sizeof(*in)) == 0)
1500 break; /* keep peer name */
1507 diff -Nur postfix-1.1.2.orig/src/smtpstone/smtp-sink.c postfix-1.1.2/src/smtpstone/smtp-sink.c
1508 --- postfix-1.1.2.orig/src/smtpstone/smtp-sink.c Thu Nov 8 21:15:32 2001
1509 +++ postfix-1.1.2/src/smtpstone/smtp-sink.c Mon Jan 28 12:40:04 2002
1512 if (strncmp(argv[optind], "inet:", 5) == 0)
1514 - sock = inet_listen(argv[optind], backlog, BLOCKING);
1515 + sock = inet_listen(argv[optind], backlog, BLOCKING, 1);
1519 diff -Nur postfix-1.1.2.orig/src/util/Makefile.in postfix-1.1.2/src/util/Makefile.in
1520 --- postfix-1.1.2.orig/src/util/Makefile.in Mon Jan 28 12:38:34 2002
1521 +++ postfix-1.1.2/src/util/Makefile.in Mon Jan 28 12:41:17 2002
1523 dict_tcp.c dict_unix.c dir_forest.c doze.c duplex_pipe.c \
1524 environ.c events.c exec_command.c fifo_listen.c fifo_trigger.c \
1525 file_limit.c find_inet.c fsspace.c fullname.c get_domainname.c \
1526 - get_hostname.c hex_quote.c htable.c inet_addr_host.c \
1527 + get_hostname.c get_port.c hex_quote.c htable.c inet_addr_host.c \
1528 inet_addr_list.c inet_addr_local.c inet_connect.c inet_listen.c \
1529 inet_trigger.c inet_util.c intv.c line_wrap.c lowercase.c \
1530 lstat_as.c mac_expand.c mac_parse.c make_dirs.c match_list.c \
1532 dict_tcp.o dict_unix.o dir_forest.o doze.o duplex_pipe.o \
1533 environ.o events.o exec_command.o fifo_listen.o fifo_trigger.o \
1534 file_limit.o find_inet.o fsspace.o fullname.o get_domainname.o \
1535 - get_hostname.o hex_quote.o htable.o inet_addr_host.o \
1536 + get_hostname.o get_port.o hex_quote.o htable.o inet_addr_host.o \
1537 inet_addr_list.o inet_addr_local.o inet_connect.o inet_listen.o \
1538 inet_trigger.o inet_util.o intv.o line_wrap.o lowercase.o \
1539 lstat_as.o mac_expand.o mac_parse.o make_dirs.o match_list.o \
1541 dict_ht.h dict_ldap.h dict_mysql.h dict_ni.h dict_nis.h \
1542 dict_nisplus.h dict_pcre.h dict_regexp.h dict_static.h dict_tcp.h \
1543 dict_unix.h dir_forest.h events.h exec_command.h find_inet.h \
1544 - fsspace.h fullname.h get_domainname.h get_hostname.h hex_quote.h \
1545 + fsspace.h fullname.h get_domainname.h get_hostname.h get_port.h hex_quote.h \
1546 htable.h inet_addr_host.h inet_addr_list.h inet_addr_local.h \
1547 inet_util.h intv.h iostuff.h line_wrap.h listen.h lstat_as.h \
1548 mac_expand.h mac_parse.h make_dirs.h match_list.h match_ops.h \
1550 get_domainname.o: mymalloc.h
1551 get_domainname.o: get_hostname.h
1552 get_domainname.o: get_domainname.h
1553 +get_port.o: sys_defs.h
1554 get_hostname.o: get_hostname.c
1555 get_hostname.o: sys_defs.h
1556 get_hostname.o: mymalloc.h
1558 match_list.o: stringops.h
1559 match_list.o: argv.h
1560 match_list.o: dict.h
1561 +match_list.o: inet_util.h
1562 match_list.o: match_ops.h
1563 match_list.o: match_list.h
1564 match_ops.o: match_ops.c
1565 diff -Nur postfix-1.1.2.orig/src/util/get_port.c postfix-1.1.2/src/util/get_port.c
1566 --- postfix-1.1.2.orig/src/util/get_port.c Thu Jan 1 01:00:00 1970
1567 +++ postfix-1.1.2/src/util/get_port.c Mon Jan 28 12:40:04 2002
1573 +/* trivial host and port extracter
1575 +/* #include <get_port.h>
1577 +/* char *get_port(data)
1581 +/* get_port() extract host name or ip address from
1582 +/* strings such as [3ffe:902:12::10]:25, [::1]
1583 +/* or 192.168.0.1:25, and null-terminates the
1584 +/* \fIdata\fR at the first occurrence of port separator.
1586 +/* If port not found return null pointer.
1590 +/* BSD Style (or BSD like) license.
1592 +/* Arkadiusz Mi¶kiewicz <misiek@pld.org.pl>
1596 +/* System libraries */
1598 +#include <sys_defs.h>
1599 +#include <string.h>
1601 +/* Utility library. */
1603 +#include "get_port.h"
1605 +/* get_port - extract port number from string */
1607 +char *get_port(char *data)
1609 + const char *escl=strchr(data,'[');
1610 + const char *sepl=strchr(data,':');
1611 + char *escr=strrchr(data,']');
1612 + char *sepr=strrchr(data,':');
1614 + /* extract from "[address]:port" or "[address]"*/
1617 + memmove(data, data + 1, strlen(data) - strlen(escr));
1618 + data[strlen(data) - strlen(escr) - 1] = 0;
1622 + return (*escr ? escr : NULL);
1624 + /* extract from "address:port" or "address" */
1625 + if ((sepl == sepr) && sepr && sepl)
1631 + /* return empty string */
1634 diff -Nur postfix-1.1.2.orig/src/util/get_port.h postfix-1.1.2/src/util/get_port.h
1635 --- postfix-1.1.2.orig/src/util/get_port.h Thu Jan 1 01:00:00 1970
1636 +++ postfix-1.1.2/src/util/get_port.h Mon Jan 28 12:40:04 2002
1638 +#ifndef _GET_PORT_H_INCLUDED_
1639 +#define _GET_PORT_H_INCLUDED_
1645 +/* trivial host and port extracter
1647 +/* #include <get_port.h>
1651 + /* External interface. */
1653 +extern char *get_port(char *);
1659 +/* BSD Style (or BSD like) license.
1661 +/* Arkadiusz Mi¶kiewicz <misiek@pld.org.pl>
1666 diff -Nur postfix-1.1.2.orig/src/util/inet_addr_host.c postfix-1.1.2/src/util/inet_addr_host.c
1667 --- postfix-1.1.2.orig/src/util/inet_addr_host.c Fri Dec 11 19:55:35 1998
1668 +++ postfix-1.1.2/src/util/inet_addr_host.c Mon Jan 28 12:40:04 2002
1670 #include <sys_defs.h>
1671 #include <netinet/in.h>
1672 #include <arpa/inet.h>
1673 +#include <sys/socket.h>
1675 +#include <stdlib.h>
1676 +#include <string.h>
1679 #define INADDR_NONE 0xffffffff
1682 #include <inet_addr_list.h>
1683 #include <inet_addr_host.h>
1688 /* inet_addr_host - look up address list for host */
1690 int inet_addr_host(INET_ADDR_LIST *addr_list, const char *hostname)
1694 + struct addrinfo hints, *res0, *res;
1696 + char buforhosta[1024];
1701 struct in_addr addr;
1703 int initial_count = addr_list->used;
1706 + memset(&hints, 0, sizeof(hints));
1707 + hints.ai_family = PF_UNSPEC;
1708 + hints.ai_socktype = SOCK_DGRAM;
1709 + error = getaddrinfo(hostname, NULL, &hints, &res0);
1711 + for (res = res0; res; res = res->ai_next) {
1712 + if(res->ai_family != AF_INET && res->ai_family != AF_INET6)
1714 + /* filter out address families that are not supported */
1715 + s = socket(res->ai_family, SOCK_DGRAM, 0);
1720 + inet_addr_list_append(addr_list, res->ai_addr);
1722 + freeaddrinfo(res0);
1725 if ((addr.s_addr = inet_addr(hostname)) != INADDR_NONE) {
1726 inet_addr_list_append(addr_list, &addr);
1729 inet_addr_list_append(addr_list,
1730 (struct in_addr *) * hp->h_addr_list++);
1734 return (addr_list->used - initial_count);
1743 INET_ADDR_LIST addr_list;
1745 + struct sockaddr *sa;
1746 + char hbuf[NI_MAXHOST];
1748 msg_vstream_init(argv[0], VSTREAM_ERR);
1751 if (inet_addr_host(&addr_list, *argv) == 0)
1752 msg_fatal("not found: %s", *argv);
1754 - for (i = 0; i < addr_list.used; i++)
1755 - vstream_printf("%s\n", inet_ntoa(addr_list.addrs[i]));
1756 + for (i = 0; i < addr_list.used; i++) {
1757 + sa = (struct sockaddr *)&addr_list.addrs[i];
1758 + getnameinfo(sa, SA_LEN(sa), hbuf, sizeof(hbuf), NULL, 0,
1760 + vstream_printf("%s\n", hbuf);
1762 vstream_fflush(VSTREAM_OUT);
1764 inet_addr_list_free(&addr_list);
1765 diff -Nur postfix-1.1.2.orig/src/util/inet_addr_list.c postfix-1.1.2/src/util/inet_addr_list.c
1766 --- postfix-1.1.2.orig/src/util/inet_addr_list.c Tue Jul 31 20:13:41 2001
1767 +++ postfix-1.1.2/src/util/inet_addr_list.c Mon Jan 28 12:40:04 2002
1769 #include <arpa/inet.h>
1775 +#include <string.h>
1776 +#include <sys/socket.h>
1779 /* Utility library. */
1787 + list->addrs = (struct sockaddr_storage *)
1789 list->addrs = (struct in_addr *)
1791 mymalloc(sizeof(*list->addrs) * list->size);
1794 /* inet_addr_list_append - append address to internet address list */
1797 +void inet_addr_list_append(INET_ADDR_LIST *list,
1798 + struct sockaddr * addr)
1800 + char *myname = "inet_addr_list_append";
1801 + char hbuf[NI_MAXHOST];
1803 + if (msg_verbose > 1) {
1804 + if (getnameinfo(addr, SA_LEN(addr), hbuf, sizeof(hbuf), NULL, 0,
1805 + NI_NUMERICHOST)) {
1806 + strncpy(hbuf, "??????", sizeof(hbuf));
1808 + msg_info("%s: %s", myname, hbuf);
1811 + if (list->used >= list->size)
1813 + list->addrs = (struct sockaddr_storage *)
1814 + myrealloc((char *) list->addrs,
1815 + sizeof(*list->addrs) * list->size);
1816 + memcpy(&list->addrs[list->used++], addr, SA_LEN(addr));
1819 void inet_addr_list_append(INET_ADDR_LIST *list, struct in_addr * addr)
1821 char *myname = "inet_addr_list_append";
1822 @@ -83,15 +117,22 @@
1823 sizeof(*list->addrs) * list->size);
1824 list->addrs[list->used++] = *addr;
1828 /* inet_addr_list_comp - compare addresses */
1830 static int inet_addr_list_comp(const void *a, const void *b)
1833 + if(((struct sockaddr*)a)->sa_family != ((struct sockaddr*)b)->sa_family)
1834 + return ( ((struct sockaddr*)a)->sa_family - ((struct sockaddr*)b)->sa_family );
1835 + return memcmp(a,b,SA_LEN((struct sockaddr*)a));
1837 const struct in_addr *a_addr = (const struct in_addr *) a;
1838 const struct in_addr *b_addr = (const struct in_addr *) b;
1840 return (a_addr->s_addr - b_addr->s_addr);
1844 /* inet_addr_list_uniq - weed out duplicates */
1845 diff -Nur postfix-1.1.2.orig/src/util/inet_addr_list.h postfix-1.1.2/src/util/inet_addr_list.h
1846 --- postfix-1.1.2.orig/src/util/inet_addr_list.h Tue Jul 31 19:56:47 2001
1847 +++ postfix-1.1.2/src/util/inet_addr_list.h Mon Jan 28 12:40:04 2002
1850 #include <netinet/in.h>
1854 +#define SA_LEN(x) (((x)->sa_family == AF_INET6) ? sizeof(struct sockaddr_in6) : sizeof(struct sockaddr_in))
1855 +#define SS_LEN(x) (((x).ss_family == AF_INET6) ? sizeof(struct sockaddr_in6) : sizeof(struct sockaddr_in))
1857 +#define SA_LEN(x) ((x)->sa_len)
1858 +#define SS_LEN(x) ((x).ss_len)
1863 * External interface.
1865 typedef struct INET_ADDR_LIST {
1866 int used; /* nr of elements in use */
1867 int size; /* actual list size */
1869 + struct sockaddr_storage *addrs; /* payload */
1871 struct in_addr *addrs; /* payload */
1875 extern void inet_addr_list_init(INET_ADDR_LIST *);
1876 extern void inet_addr_list_free(INET_ADDR_LIST *);
1877 extern void inet_addr_list_uniq(INET_ADDR_LIST *);
1880 +extern void inet_addr_list_append(INET_ADDR_LIST *, struct sockaddr *);
1882 extern void inet_addr_list_append(INET_ADDR_LIST *, struct in_addr *);
1887 diff -Nur postfix-1.1.2.orig/src/util/inet_addr_local.c postfix-1.1.2/src/util/inet_addr_local.c
1888 --- postfix-1.1.2.orig/src/util/inet_addr_local.c Sun Feb 25 19:20:19 2001
1889 +++ postfix-1.1.2/src/util/inet_addr_local.c Mon Jan 28 12:40:04 2002
1894 +#if defined(INET6) && (defined (LINUX) || defined (LINUX2))
1898 +#ifdef HAVE_GETIFADDRS
1899 +#include <ifaddrs.h>
1902 /* Utility library. */
1904 @@ -78,18 +85,104 @@
1906 int inet_addr_local(INET_ADDR_LIST *addr_list, INET_ADDR_LIST *mask_list)
1908 +#ifdef HAVE_GETIFADDRS
1909 + char *myname = "inet_addr_local";
1910 + struct ifaddrs *ifap, *ifa;
1911 + int initial_count = addr_list->used;
1912 + struct sockaddr *sa, *sam;
1915 + struct sockaddr_in6 addr6;
1918 + void *addr,*addrm;
1921 + if (getifaddrs(&ifap) < 0)
1922 + msg_fatal("%s: getifaddrs: %m", myname);
1924 + for (ifa = ifap; ifa; ifa = ifa->ifa_next) {
1925 + if (! (ifa->ifa_flags & IFF_RUNNING) || ifa->ifa_addr==NULL)
1927 + sa = ifa->ifa_addr;
1928 + sam = ifa->ifa_netmask;
1929 + switch (ifa->ifa_addr->sa_family) {
1932 + addr = (void *)&((struct sockaddr_in *)ifa->ifa_addr)->sin_addr;
1933 + addrm = (void *)&((struct sockaddr_in *)ifa->ifa_netmask)->sin_addr;
1939 + memcpy(&addr6, ifa->ifa_addr, ifa->ifa_addr->sa_len);
1940 + /* decode scoped address notation */
1941 + if ((IN6_IS_ADDR_LINKLOCAL(&addr6.sin6_addr) ||
1942 + IN6_IS_ADDR_SITELOCAL(&addr6.sin6_addr)) &&
1943 + addr6.sin6_scope_id == 0) {
1944 + addr6.sin6_scope_id = ntohs(addr6.sin6_addr.s6_addr[3] |
1945 + (unsigned int)addr6.sin6_addr.s6_addr[2] << 8);
1946 + addr6.sin6_addr.s6_addr[2] = addr6.sin6_addr.s6_addr[3] = 0;
1947 + sa = (struct sockaddr *)&addr6;
1957 + inet_addr_list_append(addr_list, sa);
1958 + if (mask_list != NULL)
1959 + inet_addr_list_append(mask_list, sam);
1961 + inet_addr_list_append(addr_list, (struct in_addr *)addr);
1962 + if (mask_list != NULL)
1963 + inet_addr_list_append(mask_list, (struct in_addr *)addrm);
1967 + freeifaddrs(ifap);
1968 + return (addr_list->used - initial_count);
1970 char *myname = "inet_addr_local";
1973 struct ifreq *the_end;
1975 - VSTRING *buf = vstring_alloc(1024);
1977 int initial_count = addr_list->used;
1978 struct in_addr addr;
1979 struct ifreq *ifr_mask;
1982 +#if defined (LINUX) || defined (LINUX2)
1983 +#define _PATH_PROCNET_IFINET6 "/proc/net/if_inet6"
1985 + char addr6p[8][5], addr6res[40], devname[20];
1986 + int plen, scope, dad_status, if_idx, gaierror;
1987 + struct addrinfo hints, *res, *res0;
1989 + struct sockaddr_in6 addr6;
1991 - if ((sock = socket(PF_INET, SOCK_DGRAM, 0)) < 0)
1994 + buf = vstring_alloc(1024);
1996 + if ((sock = socket(af, SOCK_DGRAM, 0)) < 0) {
1998 + if (af == AF_INET6)
2001 + msg_warn("%s: socket: %m", myname);
2006 msg_fatal("%s: socket: %m", myname);
2010 * Get the network interface list. XXX The socket API appears to have no
2011 @@ -126,10 +213,15 @@
2013 the_end = (struct ifreq *) (ifc.ifc_buf + ifc.ifc_len);
2014 for (ifr = ifc.ifc_req; ifr < the_end;) {
2015 - if (ifr->ifr_addr.sa_family == AF_INET) { /* IP interface */
2016 + if ((ifr->ifr_addr.sa_family == AF_INET) &&
2017 + (ifr->ifr_addr.sa_family == af)) { /* IP interface */
2018 addr = ((struct sockaddr_in *) & ifr->ifr_addr)->sin_addr;
2019 if (addr.s_addr != INADDR_ANY) { /* has IP address */
2021 + inet_addr_list_append(addr_list, &ifr->ifr_addr);
2023 inet_addr_list_append(addr_list, &addr);
2026 ifr_mask = (struct ifreq *) mymalloc(IFREQ_SIZE(ifr));
2027 memcpy((char *) ifr_mask, (char *) ifr, IFREQ_SIZE(ifr));
2028 @@ -141,11 +233,61 @@
2033 + else if ((ifr->ifr_addr.sa_family == AF_INET6) &&
2034 + (ifr->ifr_addr.sa_family == af)) { /* IPv6 interface */
2035 + addr6 = *((struct sockaddr_in6 *) & ifr->ifr_addr);
2037 + /* decode scoped address notation */
2038 + if ((IN6_IS_ADDR_LINKLOCAL(&addr6.sin6_addr) ||
2039 + IN6_IS_ADDR_SITELOCAL(&addr6.sin6_addr)) &&
2040 + addr6.sin6_scope_id == 0) {
2041 + addr6.sin6_scope_id = ntohs(addr6.sin6_addr.s6_addr[3] |
2042 + (unsigned int)addr6.sin6_addr.s6_addr[2] << 8);
2043 + addr6.sin6_addr.s6_addr[2] = addr6.sin6_addr.s6_addr[3] = 0;
2046 + if (!(IN6_IS_ADDR_UNSPECIFIED(&addr6.sin6_addr)))
2047 + inet_addr_list_append(addr_list, (struct sockaddr *)&addr6);
2050 ifr = NEXT_INTERFACE(ifr);
2056 + if (af != AF_INET6) {
2058 + goto other_socket_type;
2060 +#if defined (LINUX) || defined (LINUX2)
2061 + if ((f = fopen(_PATH_PROCNET_IFINET6, "r")) != NULL) {
2062 + while (fscanf(f, "%4s%4s%4s%4s%4s%4s%4s%4s %02x %02x %02x %02x %20s\n",
2063 + addr6p[0], addr6p[1], addr6p[2], addr6p[3], addr6p[4],
2064 + addr6p[5], addr6p[6], addr6p[7],
2065 + &if_idx, &plen, &scope, &dad_status, devname) != EOF) {
2066 + sprintf(addr6res, "%s:%s:%s:%s:%s:%s:%s:%s",
2067 + addr6p[0], addr6p[1], addr6p[2], addr6p[3],
2068 + addr6p[4], addr6p[5], addr6p[6], addr6p[7]);
2069 + addr6res[sizeof(addr6res) - 1] = 0;
2070 + memset(&hints, 0, sizeof(hints));
2071 + hints.ai_flags = AI_NUMERICHOST;
2072 + hints.ai_family = AF_UNSPEC;
2073 + hints.ai_socktype = SOCK_DGRAM;
2074 + gaierror = getaddrinfo(addr6res, NULL, &hints, &res0);
2076 + for (res = res0; res; res = res->ai_next) {
2077 + inet_addr_list_append(addr_list, res->ai_addr);
2079 + freeaddrinfo(res0);
2085 return (addr_list->used - initial_count);
2091 INET_ADDR_LIST addr_list;
2092 INET_ADDR_LIST mask_list;
2094 + char abuf[NI_MAXHOST], mbuf[NI_MAXHOST];
2095 + struct sockaddr *sa;
2097 msg_vstream_init(argv[0], VSTREAM_ERR);
2099 @@ -172,8 +316,17 @@
2100 msg_warn("found only one active network interface");
2102 for (i = 0; i < addr_list.used; i++) {
2103 - vstream_printf("%s/", inet_ntoa(addr_list.addrs[i]));
2104 - vstream_printf("%s\n", inet_ntoa(mask_list.addrs[i]));
2105 + sa = (struct sockaddr *)&addr_list.addrs[i];
2106 + if (getnameinfo(sa, SA_LEN(sa), abuf, sizeof(abuf), NULL, 0,
2107 + NI_NUMERICHOST)) {
2108 + strncpy(abuf, "???", sizeof(abuf));
2110 + sa = (struct sockaddr *)&mask_list.addrs[i];
2111 + if (getnameinfo(sa, SA_LEN(sa), mbuf, sizeof(mbuf), NULL, 0,
2112 + NI_NUMERICHOST)) {
2113 + strncpy(mbuf, "???", sizeof(mbuf));
2115 + vstream_printf("%s/%s\n", abuf, mbuf);
2117 vstream_fflush(VSTREAM_OUT);
2118 inet_addr_list_free(&addr_list);
2119 diff -Nur postfix-1.1.2.orig/src/util/inet_connect.c postfix-1.1.2/src/util/inet_connect.c
2120 --- postfix-1.1.2.orig/src/util/inet_connect.c Mon Nov 20 19:06:31 2000
2121 +++ postfix-1.1.2/src/util/inet_connect.c Mon Jan 28 12:40:04 2002
2130 /* Utility library. */
2137 + struct addrinfo hints, *res, *res0;
2140 struct sockaddr_in sin;
2148 buf = inet_parse(addr, &host, &port);
2152 + memset(&hints, 0, sizeof(hints));
2153 + hints.ai_family = PF_UNSPEC;
2154 + hints.ai_socktype = SOCK_STREAM;
2155 + hints.ai_flags = AI_NUMERICHOST; /* find_inet_addr is numeric only */
2156 + if (getaddrinfo(host, port, &hints, &res0))
2157 + msg_fatal("host not found: %s", host);
2161 memset((char *) &sin, 0, sizeof(sin));
2162 sin.sin_family = AF_INET;
2163 sin.sin_addr.s_addr = find_inet_addr(host);
2164 sin.sin_port = find_inet_port(port, "tcp");
2170 + for (res = res0; res; res = res->ai_next) {
2171 + if ((res->ai_family != AF_INET) && (res->ai_family != AF_INET6))
2174 + sock = socket(res->ai_family, res->ai_socktype, res->ai_protocol);
2177 + if (timeout > 0) {
2178 + non_blocking(sock, NON_BLOCKING);
2179 + if (timed_connect(sock, res->ai_addr, res->ai_addrlen, timeout) < 0) {
2184 + if (block_mode != NON_BLOCKING)
2185 + non_blocking(sock, block_mode);
2188 + non_blocking(sock, block_mode);
2189 + if (connect(sock, res->ai_addr, res->ai_addrlen) < 0
2190 + && errno != EINPROGRESS) {
2198 + freeaddrinfo(res0);
2202 * Create a client socket.
2210 diff -Nur postfix-1.1.2.orig/src/util/inet_listen.c postfix-1.1.2/src/util/inet_listen.c
2211 --- postfix-1.1.2.orig/src/util/inet_listen.c Mon Nov 20 19:06:32 2000
2212 +++ postfix-1.1.2/src/util/inet_listen.c Mon Jan 28 12:40:04 2002
2215 /* #include <listen.h>
2217 -/* int inet_listen(addr, backlog, block_mode)
2218 +/* int inet_listen(addr, backlog, block_mode, addinuse_fatal)
2219 /* const char *addr;
2223 #include <sys_defs.h>
2224 #include <sys/socket.h>
2225 #include <netinet/in.h>
2227 +#if (! __GLIBC__ >= 2 && __GLIBC_MINOR__ >=1 )
2228 +#include <netinet6/in6.h>
2231 #include <arpa/inet.h>
2233 #ifndef MAXHOSTNAMELEN
2234 #include <sys/param.h>
2240 @@ -77,35 +83,116 @@
2242 /* inet_listen - create inet-domain listener */
2244 -int inet_listen(const char *addr, int backlog, int block_mode)
2245 +int inet_listen(const char *addr, int backlog, int block_mode, int addrinuse_fatal)
2248 + struct addrinfo *res, *res0, hints;
2255 + struct sockaddr *ai_addr;
2256 + SOCKADDR_SIZE ai_addrlen;
2257 + struct ai *ai_next;
2258 + } *res, *res0, resbody;
2259 struct sockaddr_in sin;
2263 + int addrinuse = 0;
2268 + char hbuf[NI_MAXHOST], pbuf[NI_MAXSERV];
2270 + char hbuf[sizeof("255.255.255.255") + 1];
2271 + char pbuf[sizeof("255.255.255.255") + 1];
2273 + char *cause = "unknown";
2276 * Translate address information to internal form.
2278 buf = inet_parse(addr, &host, &port);
2279 - memset((char *) &sin, 0, sizeof(sin));
2281 + memset(&hints, 0, sizeof(hints));
2282 + hints.ai_flags = AI_PASSIVE;
2283 + hints.ai_family = AF_UNSPEC;
2284 + hints.ai_socktype = SOCK_STREAM;
2285 + error = getaddrinfo(*host ? host : NULL, *port ? port : "0", &hints, &res0);
2287 + msg_fatal("getaddrinfo: %s", gai_strerror(error));
2291 + memset(&sin, 0, sizeof(sin));
2292 sin.sin_family = AF_INET;
2294 + sin.sin_len = sizeof(sin);
2296 sin.sin_port = find_inet_port(port, "tcp");
2297 sin.sin_addr.s_addr = (*host ? find_inet_addr(host) : INADDR_ANY);
2301 - * Create a listener socket.
2303 - if ((sock = socket(AF_INET, SOCK_STREAM, 0)) < 0)
2304 - msg_fatal("socket: %m");
2305 - if (setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, (char *) &t, sizeof(t)) < 0)
2306 - msg_fatal("setsockopt: %m");
2307 - if (bind(sock, (struct sockaddr *) & sin, sizeof(sin)) < 0)
2308 - msg_fatal("bind %s port %d: %m", sin.sin_addr.s_addr == INADDR_ANY ?
2309 - "INADDR_ANY" : inet_ntoa(sin.sin_addr), ntohs(sin.sin_port));
2310 + memset(&resbody, 0, sizeof(resbody));
2311 + resbody.ai_socktype = SOCK_STREAM;
2312 + resbody.ai_family = AF_INET;
2313 + resbody.ai_addr = (struct sockaddr *)&sin;
2314 + resbody.ai_addrlen = sizeof(sin);
2320 + for (res = res0; res; res = res->ai_next) {
2321 + if ((res->ai_family != AF_INET) && (res->ai_family != AF_INET6))
2325 + * Create a listener socket.
2327 + if ((sock = socket(res->ai_family, res->ai_socktype, 0)) < 0) {
2332 + if (res->ai_family == AF_INET6 &&
2333 + setsockopt(sock, IPPROTO_IPV6, IPV6_V6ONLY, (char *) &t, sizeof(t)) < 0) {
2334 + /* if kernel/libc don't support this simple ignore it
2335 + cause = "setsockopt(IPV6_V6ONLY)";
2343 + if (setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, (char *) &t, sizeof(t)) < 0) {
2344 + cause = "setsockopt(SO_REUSEADDR)";
2350 + if (bind(sock, res->ai_addr, res->ai_addrlen) < 0) {
2352 + if (errno == EADDRINUSE)
2360 + if (sock < 0 && (addrinuse_fatal || !addrinuse))
2361 + msg_fatal("%s: %m", cause);
2363 + freeaddrinfo(res0);
2367 non_blocking(sock, block_mode);
2368 if (listen(sock, backlog) < 0)
2369 msg_fatal("listen: %m");
2370 diff -Nur postfix-1.1.2.orig/src/util/listen.h postfix-1.1.2/src/util/listen.h
2371 --- postfix-1.1.2.orig/src/util/listen.h Mon Mar 22 02:57:11 1999
2372 +++ postfix-1.1.2/src/util/listen.h Mon Jan 28 12:40:04 2002
2374 * Listener external interface.
2376 extern int unix_listen(const char *, int, int);
2377 -extern int inet_listen(const char *, int, int);
2378 +extern int inet_listen(const char *, int, int, int);
2379 extern int fifo_listen(const char *, int, int);
2380 extern int stream_listen(const char *, int, int);
2382 diff -Nur postfix-1.1.2.orig/src/util/match_list.c postfix-1.1.2/src/util/match_list.c
2383 --- postfix-1.1.2.orig/src/util/match_list.c Tue Nov 20 21:07:15 2001
2384 +++ postfix-1.1.2/src/util/match_list.c Mon Jan 28 12:40:04 2002
2386 list = match_list_parse(list, vstring_str(buf));
2387 if (vstream_fclose(fp))
2388 msg_fatal("%s: read file %s: %m", myname, pattern);
2389 - } else if (strchr(pattern, ':') != 0) { /* type:table */
2390 + } else if ((strchr(pattern, ']') == 0) && (strchr(pattern, ':') != 0)) { /* type:table */
2391 for (cp = pattern; *cp == '!'; cp++)
2393 if (dict_handle(pattern) == 0)
2394 diff -Nur postfix-1.1.2.orig/src/util/match_ops.c postfix-1.1.2/src/util/match_ops.c
2395 --- postfix-1.1.2.orig/src/util/match_ops.c Tue Nov 20 21:16:10 2001
2396 +++ postfix-1.1.2/src/util/match_ops.c Mon Jan 28 12:40:04 2002
2398 #include <match_ops.h>
2399 #include <stringops.h>
2405 + * This program is free software; you can redistribute it and/or
2406 + * modify it under the terms of the GNU General Public License
2407 + * as published by the Free Software Foundation; either version
2408 + * 2 of the License, or (at your option) any later version.
2410 + * Authors: Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
2413 + * Artur Frysiak <wiget@pld.org.pl>
2414 + * Arkadiusz Mi¶kiewicz <misiek@pld.org.pl>
2418 +#include <stdlib.h>
2419 +#include <unistd.h>
2420 +#include <syslog.h>
2422 +#include <sys/socket.h>
2423 +#include <netinet/in.h>
2424 +#include <string.h>
2426 +#include <arpa/inet.h>
2427 +#include <resolv.h>
2430 +#define AF_DECnet 12
2434 +#define PF_PACKET 17
2439 + unsigned char family;
2440 + unsigned char bytelen;
2441 + signed short bitlen;
2442 + unsigned int data[4];
2446 +int masked_match(char *, char *, char *);
2447 +int get_integer(int *, char *, int);
2448 +int get_addr_1(inet_prefix *, char *, int);
2449 +int get_prefix_1(inet_prefix *, char *, int);
2450 +int get_addr(inet_prefix *, char *, int);
2451 +int get_prefix(inet_prefix *, char *, int);
2452 +unsigned int get_addr32(char *);
2453 +int matches(char *, char *);
2454 +int inet_addr_match(inet_prefix *, inet_prefix *, int);
2455 +int mask_match(char *, char *, char *);
2457 +int get_integer(int *val, char *arg, int base)
2462 + if (!arg || !*arg)
2464 + res = strtol(arg, &ptr, base);
2465 + if (!ptr || ptr == arg || *ptr || res > INT_MAX || res < INT_MIN)
2471 +int get_addr_1(inet_prefix *addr, char *name, int family)
2474 + unsigned char *ap = (unsigned char*)addr->data;
2477 + memset(addr, 0, sizeof(*addr));
2479 + if (strcmp(name, "default") == 0 || strcmp(name, "any") == 0) {
2480 + if (family == AF_DECnet)
2482 + addr->family = family;
2483 + addr->bytelen = (family == AF_INET6 ? 16 : 4);
2484 + addr->bitlen = -1;
2488 + if (strchr(name, ':')) {
2489 + addr->family = AF_INET6;
2490 + if (family != AF_UNSPEC && family != AF_INET6)
2492 + if (inet_pton(AF_INET6, name, addr->data) <= 0)
2494 + addr->bytelen = 16;
2495 + addr->bitlen = -1;
2498 + addr->family = AF_INET;
2499 + if (family != AF_UNSPEC && family != AF_INET)
2501 + addr->bytelen = 4;
2502 + addr->bitlen = -1;
2503 + for (cp = name, i = 0; *cp; cp++) {
2504 + if (*cp <= '9' && *cp >= '0') {
2505 + ap[i] = 10*ap[i] + (*cp-'0');
2508 + if (*cp == '.' && ++i <= 3)
2515 +int get_prefix_1(inet_prefix *dst, char *arg, int family)
2521 + memset(dst, 0, sizeof(*dst));
2523 + if (strcmp(arg, "default") == 0 || strcmp(arg, "any") == 0) {
2524 + if (family == AF_DECnet)
2526 + dst->family = family;
2532 + slash = strchr(arg, '/');
2535 + err = get_addr_1(dst, arg, family);
2537 + switch(dst->family) {
2539 + dst->bitlen = 128;
2549 + if (get_integer(&plen, slash+1, 0) || plen > dst->bitlen) {
2553 + dst->bitlen = plen;
2562 +int get_addr(inet_prefix *dst, char *arg, int family)
2565 + if (family == AF_PACKET)
2568 + if (get_addr_1(dst, arg, family))
2573 +int get_prefix(inet_prefix *dst, char *arg, int family)
2576 + if (family == AF_PACKET)
2579 + if (get_prefix_1(dst, arg, family))
2584 +unsigned int get_addr32(char *name)
2587 + if (get_addr_1(&addr, name, AF_INET))
2589 + return addr.data[0];
2592 +int matches(char *cmd, char *pattern)
2594 + int len = strlen(cmd);
2595 + if (len > strlen(pattern))
2597 + return memcmp(pattern, cmd, len);
2600 +int inet_addr_match(inet_prefix *a, inet_prefix *b, int bits)
2602 + unsigned int *a1 = a->data;
2603 + unsigned int *a2 = b->data;
2604 + int words = bits >> 0x05;
2609 + if (memcmp(a1, a2, words << 2))
2613 + unsigned int w1, w2;
2614 + unsigned int mask;
2619 + mask = htonl((0xffffffff) << (0x20 - bits));
2621 + if ((w1 ^ w2) & mask)
2628 +/* zero if matches */
2629 +int mask_match(char *network, char *cprefix, char *address)
2631 + inet_prefix *inetwork;
2632 + inet_prefix *iaddress;
2635 + if (!(network && address && cprefix))
2637 + prefix = strtol(cprefix, (char **)NULL, 10);
2638 + if ((prefix < 0) || (prefix > 128))
2640 + if ((strlen(network) == 0) || (strlen(address) == 0))
2643 + inetwork = malloc(sizeof(inet_prefix));
2644 + iaddress = malloc(sizeof(inet_prefix));
2646 + if ((get_addr(iaddress, address, AF_UNSPEC) >= 0)
2647 + && (get_addr(inetwork, network, AF_UNSPEC) >= 0))
2648 + ret = inet_addr_match(inetwork, iaddress, prefix);
2654 + /* 1 if matches */
2655 + /* return (!ret); */
2656 + /* 0 if matches */
2661 + * masked_match() - universal for IPv4 and IPv6 - 1 if matches
2663 +int masked_match(net_tok, mask_tok, string)
2669 + struct in6_addr in6[2];
2670 + char v4addr[2][INET_ADDRSTRLEN];
2675 + /* Check for NULL */
2676 + if (!(net_tok && mask_tok && string))
2677 + return 0; /* doesn't match!!! */
2679 + /* If IPv6 mapped convert to native-IPv4 */
2681 + if (inet_pton(AF_INET6, net_tok, &in6[0]) == 1 &&
2682 + inet_pton(AF_INET6, string, &in6[1]) == 1 &&
2683 + IN6_IS_ADDR_V4MAPPED(&in6[0]) && IN6_IS_ADDR_V4MAPPED(&in6[1])) {
2684 + plen = atoi(mask_tok);
2685 + if (32 < plen && plen < 129) {
2686 + sprintf(newmask, "%d", plen - 96);
2687 + mask_tok = newmask;
2690 + (void)inet_ntop(AF_INET, &in6[0].s6_addr[12], v4addr[0],
2691 + sizeof(v4addr[0]));
2692 + net_tok = v4addr[0];
2693 + (void)inet_ntop(AF_INET, &in6[1].s6_addr[12], v4addr[1],
2694 + sizeof(v4addr[1]));
2695 + string = v4addr[1];
2698 + return (!mask_match(net_tok, mask_tok, string));
2702 /* match_string - match a string literal */
2704 int match_string(int unused_flags, const char *string, const char *pattern)
2710 /* match_parse_mask - parse net/mask pattern */
2712 static int match_parse_mask(const char *pattern, unsigned long *net_bits,
2713 @@ -198,27 +500,55 @@
2719 /* match_hostaddr - match host by address */
2721 int match_hostaddr(int unused_flags, const char *addr, const char *pattern)
2723 char *myname = "match_hostaddr";
2725 + char *network, *mask, *escl, *escr, *patternx;
2726 + struct in6_addr in6;
2727 + char v4addr[INET_ADDRSTRLEN];
2730 unsigned long mask_bits;
2731 unsigned long net_bits;
2732 unsigned long addr_bits;
2736 msg_info("%s: %s ~? %s", myname, addr, pattern);
2739 + if (addr[strspn(addr, "01234567890./:abcdef")] != 0)
2741 if (addr[strspn(addr, "01234567890./:")] != 0)
2746 + patternx = mystrdup(pattern);
2747 + escl = strchr(patternx,'[');
2748 + escr = strrchr(patternx,']');
2749 + if (escl && escr) {
2751 + sprintf(patternx, "%s%s", escl + 1, escr + 1);
2752 + pattern = patternx;
2757 * Try dictionary lookup. This can be case insensitive. XXX Probably
2758 * should also try again after stripping least significant octets.
2760 - if (strchr(pattern, ':') != 0) {
2762 + if (!(escl && escr) && strchr(pattern, ':') != 0)
2764 + if (strchr(pattern, ':') != 0)
2767 if (dict_lookup(pattern, addr) != 0)
2769 if (dict_errno != 0)
2770 @@ -229,6 +559,12 @@
2772 * Try an exact match with the host address.
2775 + if (inet_pton(AF_INET6, addr, &in6) == 1 && IN6_IS_ADDR_V4MAPPED(&in6)) {
2776 + (void)inet_ntop(AF_INET, &in6.s6_addr[12], v4addr, sizeof(v4addr));
2780 if (strcasecmp(addr, pattern) == 0) {
2783 @@ -237,6 +573,20 @@
2784 * In a net/mask pattern, the mask is specified as the number of bits of
2788 + network = mystrdup(patternx);
2789 + mask = split_at(network, '/');
2791 + if (masked_match(network, mask, (char *)addr)) {
2801 if (match_parse_mask(pattern, &net_bits, &mask_shift)) {
2802 addr_bits = inet_addr(addr);
2803 if (addr_bits == INADDR_NONE)
2805 mask_bits = htonl((0xffffffff) << (BITS_PER_ADDR - mask_shift));
2806 return ((addr_bits & mask_bits) == (net_bits & mask_bits));
2811 diff -Nur postfix-1.1.2.orig/src/util/sys_defs.h postfix-1.1.2/src/util/sys_defs.h
2812 --- postfix-1.1.2.orig/src/util/sys_defs.h Mon Jan 28 12:38:34 2002
2813 +++ postfix-1.1.2/src/util/sys_defs.h Mon Jan 28 12:40:04 2002
2815 #define DEF_MAILBOX_LOCK "flock, dotlock"
2818 +#if ((defined(__NetBSD_Version__) && __NetBSD_Version__ >= 105000000) || defined(USAGI_LIBINET6))
2819 +#define HAVE_GETIFADDRS
2825 diff -Nur postfix-1.1.2.orig/src/util/valid_hostname.c postfix-1.1.2/src/util/valid_hostname.c
2826 --- postfix-1.1.2.orig/src/util/valid_hostname.c Sun Jan 28 15:10:18 2001
2827 +++ postfix-1.1.2/src/util/valid_hostname.c Mon Jan 28 12:40:04 2002
2833 +#include <netinet/in.h>
2834 +#include <sys/socket.h>
2835 +#include <arpa/inet.h>
2839 /* Utility library. */
2842 @@ -103,7 +110,23 @@
2843 msg_warn("%s: misplaced hyphen: %.100s", myname, name);
2849 + else if (ch == ':') {
2850 + struct addrinfo hints, *res;
2852 + memset(&hints, 0, sizeof(hints));
2853 + hints.ai_family = AF_INET6;
2854 + hints.ai_socktype = SOCK_STREAM; /*dummy*/
2855 + hints.ai_flags = AI_NUMERICHOST;
2856 + if (getaddrinfo(name, "0", &hints, &res) == 0) {
2857 + freeaddrinfo(res);
2865 msg_warn("%s: invalid character %d(decimal): %.100s",
2872 + struct addrinfo hints, *res;
2875 #define BYTES_NEEDED 4
2877 @@ -147,6 +173,17 @@
2882 + memset(&hints, 0, sizeof(hints));
2883 + hints.ai_family = AF_INET6;
2884 + hints.ai_socktype = SOCK_STREAM; /*dummy*/
2885 + hints.ai_flags = AI_NUMERICHOST;
2886 + if (getaddrinfo(addr, "0", &hints, &res) == 0) {
2887 + freeaddrinfo(res);
2893 * Scary code to avoid sscanf() overflow nasties.