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 diff -Nur postfix-1.1.2.orig/src/global/peer_name.c postfix-1.1.2/src/global/peer_name.c
352 --- postfix-1.1.2.orig/src/global/peer_name.c Sun Jan 28 16:23:02 2001
353 +++ postfix-1.1.2/src/global/peer_name.c Mon Jan 28 12:40:04 2002
355 PEER_NAME *peer_name(int sock)
357 static PEER_NAME peer;
358 - struct sockaddr_in sin;
359 - SOCKADDR_SIZE len = sizeof(sin);
366 + struct sockaddr peer_un;
367 + struct sockaddr_in peer_un4;
369 + struct sockaddr_in6 peer_un6;
372 +#define sun p_un.peer_un
373 +#define sin p_un.peer_un4
375 +#define sin6 p_un.peer_un6
376 + static char hbuf[NI_MAXHOST];
377 + static char abuf[NI_MAXHOST];
381 + SOCKADDR_SIZE len = sizeof(p_un);
383 - if (getpeername(sock, (struct sockaddr *) & sin, &len) == 0) {
384 - switch (sin.sin_family) {
385 + if (getpeername(sock, (struct sockaddr *)&p_un, &len) == 0) {
386 + switch (p_un.peer_un.sa_family) {
389 peer.type = PEER_TYPE_INET;
390 hp = gethostbyaddr((char *) &(sin.sin_addr),
392 hp->h_name : "unknown");
393 peer.addr = inet_ntoa(sin.sin_addr);
397 + peer.type = PEER_TYPE_INET;
398 + if (getnameinfo(&sun, len, hbuf, sizeof(hbuf), NULL, 0, NI_NAMEREQD) != 0)
399 + peer.name = "unknown";
405 + peer.type = PEER_TYPE_INET6;
406 + if (getnameinfo(&sun, len, hbuf, sizeof(hbuf), NULL, 0, NI_NAMEREQD) != 0)
407 + peer.name = "unknown";
415 peer.type = PEER_TYPE_LOCAL;
416 diff -Nur postfix-1.1.2.orig/src/global/peer_name.h postfix-1.1.2/src/global/peer_name.h
417 --- postfix-1.1.2.orig/src/global/peer_name.h Fri Dec 11 19:55:32 1998
418 +++ postfix-1.1.2/src/global/peer_name.h Mon Jan 28 12:40:04 2002
420 #define PEER_TYPE_UNKNOWN 0
421 #define PEER_TYPE_INET 1
422 #define PEER_TYPE_LOCAL 2
424 +#define PEER_TYPE_INET6 3
427 extern PEER_NAME *peer_name(int);
429 diff -Nur postfix-1.1.2.orig/src/global/resolve_local.c postfix-1.1.2/src/global/resolve_local.c
430 --- postfix-1.1.2.orig/src/global/resolve_local.c Fri Jan 18 15:06:51 2002
431 +++ postfix-1.1.2/src/global/resolve_local.c Mon Jan 28 12:40:04 2002
433 #include <netinet/in.h>
434 #include <arpa/inet.h>
439 #define INADDR_NONE 0xffffffff
442 char *saved_addr = mystrdup(addr);
445 + struct addrinfo hints, *res, *res0;
448 struct in_addr ipaddr;
452 #define RETURN(x) { myfree(saved_addr); return(x); }
454 if (*dest == '[' && dest[len - 1] == ']') {
458 + memset(&hints, 0, sizeof(hints));
459 + hints.ai_family = PF_UNSPEC;
460 + hints.ai_socktype = SOCK_DGRAM;
461 + error = getaddrinfo(dest, NULL, &hints, &res0);
463 + for (res = res0; res; res = res->ai_next) {
464 + if (own_inet_addr(res->ai_addr)) {
465 + freeaddrinfo(res0);
469 + freeaddrinfo(res0);
472 if ((ipaddr.s_addr = inet_addr(dest)) != INADDR_NONE
473 && (own_inet_addr(&ipaddr) || proxy_inet_addr(&ipaddr)))
479 diff -Nur postfix-1.1.2.orig/src/global/wildcard_inet_addr.c postfix-1.1.2/src/global/wildcard_inet_addr.c
480 --- postfix-1.1.2.orig/src/global/wildcard_inet_addr.c Thu Jan 1 01:00:00 1970
481 +++ postfix-1.1.2/src/global/wildcard_inet_addr.c Mon Jan 28 12:40:04 2002
483 +/* System library. */
485 +#include <sys_defs.h>
486 +#include <netinet/in.h>
487 +#include <arpa/inet.h>
490 +#include <sys/socket.h>
494 +#ifdef STRCASECMP_IN_STRINGS_H
495 +#include <strings.h>
498 +/* Utility library. */
501 +#include <mymalloc.h>
502 +#include <inet_addr_list.h>
503 +#include <inet_addr_local.h>
504 +#include <inet_addr_host.h>
505 +#include <stringops.h>
507 +/* Global library. */
509 +#include <mail_params.h>
510 +#include <wildcard_inet_addr.h>
512 +/* Application-specific. */
513 +static INET_ADDR_LIST addr_list;
515 +/* wildcard_inet_addr_init - initialize my own address list */
517 +static void wildcard_inet_addr_init(INET_ADDR_LIST *addr_list)
520 + struct addrinfo hints, *res, *res0;
521 + char hbuf[NI_MAXHOST];
523 +#ifdef NI_WITHSCOPEID
524 + const int niflags = NI_NUMERICHOST | NI_WITHSCOPEID;
526 + const int niflags = NI_NUMERICHOST;
529 + inet_addr_list_init(addr_list);
531 + memset(&hints, 0, sizeof(hints));
532 + hints.ai_family = PF_UNSPEC;
533 + hints.ai_socktype = SOCK_STREAM;
534 + hints.ai_flags = AI_PASSIVE;
535 + error = getaddrinfo(NULL, "0", &hints, &res0);
537 + msg_fatal("could not get list of wildcard addresses");
538 + for (res = res0; res; res = res->ai_next) {
539 + if (res->ai_family != AF_INET && res->ai_family != AF_INET6)
541 + if (getnameinfo(res->ai_addr, res->ai_addrlen, hbuf, sizeof(hbuf),
542 + NULL, 0, niflags) != 0)
544 + if (inet_addr_host(addr_list, hbuf) == 0)
545 + continue; /* msg_fatal("config variable %s: host not found: %s",
546 + VAR_INET_INTERFACES, hbuf); */
548 + freeaddrinfo(res0);
550 + if (inet_addr_host(addr_list, "0.0.0.0") == 0)
551 + msg_fatal("config variable %s: host not found: %s",
552 + VAR_INET_INTERFACES, "0.0.0.0");
556 +/* wildcard_inet_addr_list - return list of addresses */
558 +INET_ADDR_LIST *wildcard_inet_addr_list(void)
560 + if (addr_list.used == 0)
561 + wildcard_inet_addr_init(&addr_list);
563 + return (&addr_list);
565 diff -Nur postfix-1.1.2.orig/src/global/wildcard_inet_addr.h postfix-1.1.2/src/global/wildcard_inet_addr.h
566 --- postfix-1.1.2.orig/src/global/wildcard_inet_addr.h Thu Jan 1 01:00:00 1970
567 +++ postfix-1.1.2/src/global/wildcard_inet_addr.h Mon Jan 28 12:40:04 2002
569 +#ifndef _WILDCARD_INET_ADDR_H_INCLUDED_
570 +#define _WILDCARD_INET_ADDR_H_INCLUDED_
574 +/* wildcard_inet_addr_list 3h
576 +/* grab the list of wildcard IP addresses.
578 +/* #include <own_inet_addr.h>
586 +#include <netinet/in.h>
588 +#include <sys/socket.h>
592 + * External interface.
594 +extern struct INET_ADDR_LIST *wildcard_inet_addr_list(void);
601 +/* Jun-ichiro itojun Hagino
605 diff -Nur postfix-1.1.2.orig/src/master/master_ent.c postfix-1.1.2/src/master/master_ent.c
606 --- postfix-1.1.2.orig/src/master/master_ent.c Sun Dec 23 20:08:58 2001
607 +++ postfix-1.1.2/src/master/master_ent.c Mon Jan 28 12:40:04 2002
609 inet_addr_host(MASTER_INET_ADDRLIST(serv), host);
610 serv->listen_fd_count = MASTER_INET_ADDRLIST(serv)->used;
611 } else if (strcasecmp(var_inet_interfaces, DEF_INET_INTERFACES) == 0) {
613 + MASTER_INET_ADDRLIST(serv) = wildcard_inet_addr_list();
614 + serv->listen_fd_count = MASTER_INET_ADDRLIST(serv)->used;
616 MASTER_INET_ADDRLIST(serv) = 0; /* wild-card */
617 serv->listen_fd_count = 1;
620 MASTER_INET_ADDRLIST(serv) = own_inet_addr_list(); /* virtual */
621 serv->listen_fd_count = MASTER_INET_ADDRLIST(serv)->used;
622 diff -Nur postfix-1.1.2.orig/src/master/master_listen.c postfix-1.1.2/src/master/master_listen.c
623 --- postfix-1.1.2.orig/src/master/master_listen.c Tue May 1 00:47:57 2001
624 +++ postfix-1.1.2/src/master/master_listen.c Mon Jan 28 12:40:04 2002
634 /* master_listen_init - enable connection requests */
636 void master_listen_init(MASTER_SERV *serv)
638 char *myname = "master_listen_init";
643 + char hbuf[NI_MAXHOST];
644 + SOCKADDR_SIZE salen;
648 * Find out what transport we should use, then create one or more
649 @@ -111,18 +120,31 @@
651 inet_listen(MASTER_INET_PORT(serv),
652 serv->max_proc > var_proc_limit ?
653 - serv->max_proc : var_proc_limit, NON_BLOCKING);
654 + serv->max_proc : var_proc_limit, NON_BLOCKING, 1);
655 close_on_exec(serv->listen_fd[0], CLOSE_ON_EXEC);
656 } else { /* virtual or host:port */
657 - for (n = 0; n < serv->listen_fd_count; n++) {
658 + for (m = n = 0; n < serv->listen_fd_count; n++) {
660 + if (getnameinfo((struct sockaddr *)&MASTER_INET_ADDRLIST(serv)->addrs[n],
661 + SA_LEN((struct sockaddr *)&MASTER_INET_ADDRLIST(serv)->addrs[n]),
662 + hbuf, sizeof(hbuf), NULL, 0, NI_NUMERICHOST)) {
663 + strncpy(hbuf, "?????", sizeof(hbuf));
665 + end_point = concatenate(hbuf, ":", MASTER_INET_PORT(serv), (char *) 0);
667 end_point = concatenate(inet_ntoa(MASTER_INET_ADDRLIST(serv)->addrs[n]),
668 ":", MASTER_INET_PORT(serv), (char *) 0);
672 = inet_listen(end_point, serv->max_proc > var_proc_limit ?
673 - serv->max_proc : var_proc_limit, NON_BLOCKING);
674 - close_on_exec(serv->listen_fd[n], CLOSE_ON_EXEC);
675 + serv->max_proc : var_proc_limit, NON_BLOCKING, 0);
677 + serv->listen_fd[m] = tmpfd;
678 + close_on_exec(serv->listen_fd[m++], CLOSE_ON_EXEC);
682 + serv->listen_fd_count=m;
686 diff -Nur postfix-1.1.2.orig/src/qmgr/qmgr_message.c postfix-1.1.2/src/qmgr/qmgr_message.c
687 --- postfix-1.1.2.orig/src/qmgr/qmgr_message.c Sat Jul 14 15:08:57 2001
688 +++ postfix-1.1.2/src/qmgr/qmgr_message.c Mon Jan 28 12:40:04 2002
690 * every front-ent program.
692 if ((at = strrchr(recipient->address, '@')) != 0
694 + && (at + 1)[strspn(at + 1, "[]0123456789.:abcdef")] != 0
696 && (at + 1)[strspn(at + 1, "[]0123456789.")] != 0
698 && valid_hostname(at + 1, DONT_GRIPE) == 0) {
699 qmgr_bounce_recipient(message, recipient,
700 "bad host/domain syntax: \"%s\"", at + 1);
701 diff -Nur postfix-1.1.2.orig/src/smtp/Makefile.in postfix-1.1.2/src/smtp/Makefile.in
702 --- postfix-1.1.2.orig/src/smtp/Makefile.in Mon Jan 28 12:38:34 2002
703 +++ postfix-1.1.2/src/smtp/Makefile.in Mon Jan 28 12:40:04 2002
705 smtp_connect.o: ../../include/mail_params.h
706 smtp_connect.o: ../../include/own_inet_addr.h
707 smtp_connect.o: ../../include/dns.h
708 +smtp_connect.o: ../../include/get_port.h
709 smtp_connect.o: smtp.h
710 smtp_connect.o: ../../include/argv.h
711 smtp_connect.o: ../../include/deliver_request.h
712 diff -Nur postfix-1.1.2.orig/src/smtp/smtp_addr.c postfix-1.1.2/src/smtp/smtp_addr.c
713 --- postfix-1.1.2.orig/src/smtp/smtp_addr.c Sun Jul 8 17:05:26 2001
714 +++ postfix-1.1.2/src/smtp/smtp_addr.c Mon Jan 28 12:40:04 2002
715 @@ -134,18 +134,68 @@
716 static void smtp_print_addr(char *what, DNS_RR *addr_list)
719 - struct in_addr in_addr;
721 + struct sockaddr_storage ss;
723 + struct sockaddr ss;
725 + struct sockaddr_in *sin;
727 + struct sockaddr_in6 *sin6;
728 + char hbuf[NI_MAXHOST];
730 + char hbuf[sizeof("255.255.255.255") + 1];
733 msg_info("begin %s address list", what);
734 for (addr = addr_list; addr; addr = addr->next) {
735 - if (addr->data_len > sizeof(addr)) {
736 - msg_warn("skipping address length %d", addr->data_len);
738 - memcpy((char *) &in_addr, addr->data, sizeof(in_addr));
739 - msg_info("pref %4d host %s/%s",
740 - addr->pref, addr->name,
741 - inet_ntoa(in_addr));
742 + if (addr->class != C_IN) {
743 + msg_warn("skipping unsupported address (class=%u)", addr->class);
746 + switch (addr->type) {
748 + if (addr->data_len != sizeof(sin->sin_addr)) {
749 + msg_warn("skipping invalid address (AAAA, len=%u)",
753 + sin = (struct sockaddr_in *)&ss;
754 + memset(sin, 0, sizeof(*sin));
755 + sin->sin_family = AF_INET;
757 + sin->sin_len = sizeof(*sin);
759 + memcpy(&sin->sin_addr, addr->data, sizeof(sin->sin_addr));
763 + if (addr->data_len != sizeof(sin6->sin6_addr)) {
764 + msg_warn("skipping invalid address (AAAA, len=%u)",
768 + sin6 = (struct sockaddr_in6 *)&ss;
769 + memset(sin6, 0, sizeof(*sin6));
770 + sin6->sin6_family = AF_INET6;
772 + sin6->sin6_len = sizeof(*sin6);
774 + memcpy(&sin6->sin6_addr, addr->data, sizeof(sin6->sin6_addr));
778 + msg_warn("skipping unsupported address (type=%u)", addr->type);
783 + (void)getnameinfo((struct sockaddr *)&ss, SS_LEN(ss),
784 + hbuf, sizeof(hbuf), NULL, 0, NI_NUMERICHOST);
786 + (void)inet_ntop(AF_INET, &sin->sin_addr, hbuf, sizeof(hbuf));
788 + msg_info("pref %4d host %s/%s", addr->pref, addr->name, hbuf);
790 msg_info("end %s address list", what);
792 @@ -155,15 +205,23 @@
793 static DNS_RR *smtp_addr_one(DNS_RR *addr_list, char *host, unsigned pref, VSTRING *why)
795 char *myname = "smtp_addr_one";
797 struct in_addr inaddr;
803 + struct addrinfo hints, *res0, *res;
811 msg_info("%s: host %s", myname, host);
815 * Interpret a numerical name as an address.
818 smtp_errno = SMTP_FAIL;
822 + memset(&hints, 0, sizeof(hints));
823 + hints.ai_family = PF_UNSPEC;
824 + hints.ai_socktype = SOCK_STREAM;
825 + error = getaddrinfo(host, NULL, &hints, &res0);
829 + smtp_errno = SMTP_RETRY;
832 + vstring_sprintf(why, "[%s]: %s",host,gai_strerror(error));
833 + smtp_errno = SMTP_FAIL;
836 + return (addr_list);
838 + for (res = res0; res; res = res->ai_next) {
839 + memset((char *) &fixed, 0, sizeof(fixed));
840 + switch(res->ai_family) {
842 + /* XXX not scope friendly */
843 + fixed.type = T_AAAA;
844 + addr = (char *)&((struct sockaddr_in6 *)res->ai_addr)->sin6_addr;
845 + addrlen = sizeof(struct in6_addr);
849 + addr = (char *)&((struct sockaddr_in *)res->ai_addr)->sin_addr;
850 + addrlen = sizeof(struct in_addr);
853 + msg_warn("%s: unknown address family %d for %s",
854 + myname, res->ai_family, host);
857 + addr_list = dns_rr_append(addr_list,
858 + dns_rr_create(host, &fixed, pref, addr, addrlen));
861 + freeaddrinfo(res0);
867 INET_ADDR_LIST *self;
871 + struct sockaddr *sa;
875 * Find the first address that lists any address that this mail system is
876 @@ -260,12 +363,36 @@
878 self = own_inet_addr_list();
879 for (addr = addr_list; addr; addr = addr->next) {
880 - for (i = 0; i < self->used; i++)
881 + for (i = 0; i < self->used; i++) {
883 + sa = (struct sockaddr *)&self->addrs[i];
884 + switch(addr->type) {
887 + if (sa->sa_family != AF_INET6)
889 + if (memcmp(&((struct sockaddr_in6 *)sa)->sin6_addr,
890 + addr->data, sizeof(struct in6_addr)) == 0) {
895 + if (sa->sa_family != AF_INET)
897 + if (memcmp(&((struct sockaddr_in *)sa)->sin_addr,
898 + addr->data, sizeof(struct in_addr)) == 0) {
904 if (INADDRP(addr->data)->s_addr == self->addrs[i].s_addr) {
906 msg_info("%s: found at pref %d", myname, addr->pref);
914 diff -Nur postfix-1.1.2.orig/src/smtp/smtp_connect.c postfix-1.1.2/src/smtp/smtp_connect.c
915 --- postfix-1.1.2.orig/src/smtp/smtp_connect.c Mon Jan 28 12:38:34 2002
916 +++ postfix-1.1.2/src/smtp/smtp_connect.c Mon Jan 28 12:40:04 2002
918 /* System library. */
920 #include <sys_defs.h>
922 #include <sys/socket.h>
923 #include <netinet/in.h>
924 #include <arpa/inet.h>
926 #include <inet_addr_list.h>
928 #include <timed_connect.h>
929 +#include <get_port.h>
930 #include <stringops.h>
931 #include <host_port.h>
933 @@ -134,19 +136,45 @@
936 char *myname = "smtp_connect_addr";
937 - struct sockaddr_in sin;
940 + struct sockaddr_storage ss;
942 + struct sockaddr ss;
944 + struct sockaddr *sa;
945 + struct sockaddr_in *sin;
947 + struct sockaddr_in6 *sin6;
949 + SOCKADDR_SIZE salen;
951 + char hbuf[NI_MAXHOST];
953 + char hbuf[sizeof("255.255.255.255") + 1];
956 INET_ADDR_LIST *addr_list;
961 - unsigned long inaddr;
963 + sa = (struct sockaddr *)&ss;
964 + sin = (struct sockaddr_in *)&ss;
966 + sin6 = (struct sockaddr_in6 *)&ss;
972 - if (addr->data_len > sizeof(sin.sin_addr)) {
974 + if (((addr->type==T_A) && (addr->data_len > sizeof(sin->sin_addr))) ||
975 + ((addr->type==T_AAAA) && (addr->data_len > sizeof(sin6->sin6_addr))))
977 + if (addr->data_len > sizeof(sin->sin_addr))
980 msg_warn("%s: skip address with length %d", myname, addr->data_len);
981 smtp_errno = SMTP_RETRY;
983 @@ -155,17 +183,39 @@
987 - memset((char *) &sin, 0, sizeof(sin));
988 - sin.sin_family = AF_INET;
990 - if ((sock = socket(sin.sin_family, SOCK_STREAM, 0)) < 0)
991 - msg_fatal("%s: socket: %m", myname);
993 + switch (addr->type) {
996 + memset(sin6, 0, sizeof(*sin6));
997 + sin6->sin6_family = AF_INET6;
998 + salen = sizeof(*sin6);
1001 + default: /* T_A: */
1002 + memset(sin, 0, sizeof(*sin));
1003 + sin->sin_family = AF_INET;
1004 + salen = sizeof(*sin);
1008 + sa->sa_len = salen;
1010 + if ((sock = socket(sa->sa_family, SOCK_STREAM, 0)) < 0)
1011 + msg_warn("%s: socket: %m", myname);
1014 * Allow the sysadmin to specify the source address, for example, as "-o
1015 * smtp_bind_address=x.x.x.x" in the master.cf file.
1017 if (*var_smtp_bind_addr) {
1019 + struct sockaddr_in sin;
1021 + memset(&sin, 0, sizeof(sin));
1022 + sin.sin_family = AF_INET;
1024 + sin.sin_len = sizeof(sin);
1026 sin.sin_addr.s_addr = inet_addr(var_smtp_bind_addr);
1027 if (sin.sin_addr.s_addr == INADDR_NONE)
1028 msg_fatal("%s: bad %s parameter: %s",
1029 @@ -174,6 +224,25 @@
1030 msg_warn("%s: bind %s: %m", myname, inet_ntoa(sin.sin_addr));
1032 msg_info("%s: bind %s", myname, inet_ntoa(sin.sin_addr));
1034 + char hbufl[NI_MAXHOST];
1035 + struct addrinfo hints, *res;
1037 + memset(&hints, 0, sizeof(hints));
1038 + hints.ai_family = sa->sa_family;
1039 + hints.ai_socktype = SOCK_STREAM;
1040 + hints.ai_flags = AI_PASSIVE|AI_NUMERICHOST;
1041 + snprintf(hbufl, sizeof(hbufl)-1, "%s", var_smtp_bind_addr);
1042 + if (getaddrinfo(hbufl, NULL, &hints, &res) == 0) {
1043 + (void)getnameinfo(res->ai_addr, res->ai_addrlen, hbufl,
1044 + sizeof(hbufl), NULL, 0, NI_NUMERICHOST);
1045 + if (bind(sock, res->ai_addr, res->ai_addrlen) < 0)
1046 + msg_warn("%s: bind %s: %m", myname, hbufl);
1047 + freeaddrinfo(res);
1049 + msg_info("%s: bind %s", myname, hbufl);
1055 @@ -181,8 +250,17 @@
1056 * the mail appears to come from the "right" machine address.
1058 else if ((addr_list = own_inet_addr_list())->used == 1) {
1060 + struct sockaddr_in sin;
1061 + unsigned long inaddr; /*XXX BAD!*/
1063 + memset(&sin, 0, sizeof(sin));
1064 + sin.sin_family = AF_INET;
1066 + sin.sin_len = sizeof(sin);
1068 memcpy((char *) &sin.sin_addr, addr_list->addrs, sizeof(sin.sin_addr));
1069 - inaddr = ntohl(sin.sin_addr.s_addr);
1070 + inaddr = (unsigned long)ntohl(sin.sin_addr.s_addr);
1071 if (!IN_CLASSA(inaddr)
1072 || !(((inaddr & IN_CLASSA_NET) >> IN_CLASSA_NSHIFT) == IN_LOOPBACKNET)) {
1073 if (bind(sock, (struct sockaddr *) & sin, sizeof(sin)) < 0)
1074 @@ -190,30 +268,85 @@
1076 msg_info("%s: bind %s", myname, inet_ntoa(sin.sin_addr));
1079 + char hbufl[NI_MAXHOST];
1080 + struct addrinfo hints, *res = NULL, *loopback = NULL;
1082 + memset(&hints, 0, sizeof(hints));
1083 + hints.ai_family = sa->sa_family;
1084 + hints.ai_socktype = SOCK_STREAM;
1085 + if (getaddrinfo(NULL, "0", &hints, &loopback) != 0)
1089 + * getnameinfo -> getaddrinfo loop is here so that we can
1090 + * get rid of port.
1092 + (void)getnameinfo((struct sockaddr *)addr_list->addrs, SA_LEN((struct sockaddr *)addr_list->addrs),
1093 + hbufl, sizeof(hbufl), NULL, 0, NI_NUMERICHOST);
1094 + hbufl[sizeof(hbufl)-1] = 0;
1095 + memset(&hints, 0, sizeof(hints));
1096 + hints.ai_family = sa->sa_family;
1097 + hints.ai_socktype = SOCK_STREAM;
1098 + hints.ai_flags = AI_PASSIVE|AI_NUMERICHOST;
1099 + if (getaddrinfo(hbufl, NULL, &hints, &res) == 0 &&
1100 + !(res->ai_addrlen == loopback->ai_addrlen &&
1101 + memcmp(res->ai_addr, loopback->ai_addr, res->ai_addrlen) == 0)) {
1102 + if (bind(sock, res->ai_addr, res->ai_addrlen) < 0)
1103 + msg_warn("%s: bind %s: %m", myname, hbufl);
1105 + msg_info("%s: bind %s", myname, hbufl);
1108 + freeaddrinfo(res);
1110 + freeaddrinfo(loopback);
1115 * Connect to the SMTP server.
1117 - sin.sin_port = port;
1118 - memcpy((char *) &sin.sin_addr, addr->data, sizeof(sin.sin_addr));
1119 + switch (addr->type) {
1122 + /* XXX scope unfriendly */
1123 + memset(sin6, 0, sizeof(*sin6));
1124 + sin6->sin6_port = port;
1125 + sin6->sin6_family = AF_INET6;
1126 + salen = sizeof(*sin6);
1127 + memcpy(&sin6->sin6_addr, addr->data, sizeof(sin6->sin6_addr));
1128 + inet_ntop(AF_INET6, &sin6->sin6_addr, hbuf, sizeof(hbuf));
1131 + default: /* T_A */
1132 + memset(sin, 0, sizeof(*sin));
1133 + sin->sin_port = port;
1134 + sin->sin_family = AF_INET;
1135 + salen = sizeof(*sin);
1136 + memcpy(&sin->sin_addr, addr->data, sizeof(sin->sin_addr));
1137 + inet_ntop(AF_INET, &sin->sin_addr, hbuf, sizeof(hbuf));
1141 + sa->sa_len = salen;
1145 msg_info("%s: trying: %s[%s] port %d...",
1146 - myname, addr->name, inet_ntoa(sin.sin_addr), ntohs(port));
1147 + myname, addr->name, hbuf, ntohs(port));
1148 if (var_smtp_conn_tmout > 0) {
1149 non_blocking(sock, NON_BLOCKING);
1150 - conn_stat = timed_connect(sock, (struct sockaddr *) & sin,
1151 - sizeof(sin), var_smtp_conn_tmout);
1152 + conn_stat = timed_connect(sock, sa, salen, var_smtp_conn_tmout);
1153 saved_errno = errno;
1154 non_blocking(sock, BLOCKING);
1155 errno = saved_errno;
1157 - conn_stat = connect(sock, (struct sockaddr *) & sin, sizeof(sin));
1158 + conn_stat = connect(sock, sa, salen);
1160 if (conn_stat < 0) {
1161 vstring_sprintf(why, "connect to %s[%s]: %m",
1162 - addr->name, inet_ntoa(sin.sin_addr));
1163 + addr->name, hbuf);
1164 smtp_errno = SMTP_RETRY;
1168 * Skip this host if it takes no action within some time limit.
1170 if (read_wait(sock, var_smtp_helo_tmout) < 0) {
1171 - vstring_sprintf(why, "connect to %s[%s]: read timeout",
1172 - addr->name, inet_ntoa(sin.sin_addr));
1173 + vstring_sprintf(why, "connect to %s [%s]: read timeout",
1174 + addr->name, hbuf);
1175 smtp_errno = SMTP_RETRY;
1178 diff -Nur postfix-1.1.2.orig/src/smtp/smtp_unalias.c postfix-1.1.2/src/smtp/smtp_unalias.c
1179 --- postfix-1.1.2.orig/src/smtp/smtp_unalias.c Thu Sep 28 19:06:09 2000
1180 +++ postfix-1.1.2/src/smtp/smtp_unalias.c Mon Jan 28 12:40:04 2002
1182 if ((result = htable_find(cache, name)) == 0) {
1183 fqdn = vstring_alloc(10);
1184 if (dns_lookup_types(name, smtp_unalias_flags, (DNS_RR **) 0,
1185 - fqdn, (VSTRING *) 0, T_MX, T_A, 0) != DNS_OK)
1186 + fqdn, (VSTRING *) 0, T_MX, T_A,
1191 vstring_strcpy(fqdn, name);
1192 htable_enter(cache, name, result = vstring_export(fqdn));
1194 diff -Nur postfix-1.1.2.orig/src/smtpd/smtpd_check.c postfix-1.1.2/src/smtpd/smtpd_check.c
1195 --- postfix-1.1.2.orig/src/smtpd/smtpd_check.c Mon Jan 28 12:38:34 2002
1196 +++ postfix-1.1.2/src/smtpd/smtpd_check.c Mon Jan 28 12:40:04 2002
1197 @@ -1187,6 +1195,49 @@
1199 static int has_my_addr(const char *host)
1202 + char *myname = "has_my_addr";
1203 + struct addrinfo hints, *res, *res0;
1205 + char hbuf[NI_MAXHOST];
1208 + msg_info("%s: host %s", myname, host);
1211 + * If we can't lookup the host, play safe and assume it is OK.
1216 + memset(&hints, 0, sizeof(hints));
1217 + hints.ai_family = PF_UNSPEC;
1218 + hints.ai_socktype = SOCK_DGRAM;
1219 + error = getaddrinfo(host, NULL, &hints, &res0);
1222 + msg_info("%s: host %s: %s", myname, host, gai_strerror(error));
1225 + for (res = res0; res; res = res->ai_next) {
1226 + if (msg_verbose) {
1227 + if (getnameinfo(res->ai_addr, res->ai_addrlen, hbuf, sizeof(hbuf),
1228 + NULL, 0, NI_NUMERICHOST)) {
1229 + strncpy(hbuf, "???", sizeof(hbuf));
1231 + msg_info("%s: addr %s", myname, hbuf);
1233 + if (own_inet_addr(res->ai_addr)) {
1234 + freeaddrinfo(res0);
1238 + freeaddrinfo(res0);
1240 + msg_info("%s: host %s: no match", myname, host);
1244 char *myname = "has_my_addr";
1245 struct in_addr addr;
1247 @@ -1222,6 +1273,7 @@
1248 msg_info("%s: host %s: no match", myname, host);
1254 /* i_am_mx - is this machine listed as MX relay */
1255 @@ -1647,11 +1699,28 @@
1256 #define CHK_ADDR_RETURN(x,y) { *found = y; return(x); }
1258 addr = STR(vstring_strcpy(error_text, address));
1261 + if (strncmp(addr, "::ffff:", 7) == 0 && msg_verbose)
1262 + msg_info("%s: %s v6 addr in v4 compat-mode, "
1263 + "converted to v4 for map checking compatibility (%s)", \
1264 + myname, addr, addr+7);
1267 if ((dict = dict_handle(table)) == 0)
1268 msg_panic("%s: dictionary not found: %s", myname, table);
1270 if (flags == 0 || (flags & dict->flags) != 0) {
1272 + if (strncmp(addr, "::ffff:", 7) == 0) {
1273 + /* try if ::ffff: formati is present in map, if not, try
1274 + traditional IPv4 format striping :ffff: part */
1275 + if ((value = dict_get(dict, addr)) != 0 || \
1276 + (value = dict_get(dict, addr+7)) != 0)
1277 + CHK_ADDR_RETURN(check_table_result(state, table, value, address,
1278 + reply_name, reply_class,
1282 if ((value = dict_get(dict, addr)) != 0)
1283 CHK_ADDR_RETURN(check_table_result(state, table, value, address,
1284 reply_name, reply_class,
1285 @@ -2406,12 +2468,23 @@
1287 msg_info("%s: %s %s", myname, reply_class, addr);
1290 - * IPv4 only for now
1294 + /* IPv4 only for now */
1295 if (inet_pton(AF_INET, addr, &a) != 1)
1296 return SMTPD_CHECK_DUNNO;
1297 + octets = argv_split(state->addr, ".");
1299 + /* IPv4 and IPv6-mapped IPv4 only for now */
1300 + if (inet_pton(AF_INET, state->addr, &a) == 1)
1301 + octets = argv_split(state->addr, ".");
1303 + struct in6_addr a6;
1304 + if (inet_pton(AF_INET6, state->addr, &a6) != 1)
1305 + return SMTPD_CHECK_DUNNO;
1306 + if (!IN6_IS_ADDR_V4MAPPED(&a6) || (strrchr(state->addr,':') == NULL))
1307 + return SMTPD_CHECK_DUNNO;
1308 + octets = argv_split(strrchr(state->addr,':')+1, ".");
1313 diff -Nur postfix-1.1.2.orig/src/smtpd/smtpd_peer.c postfix-1.1.2/src/smtpd/smtpd_peer.c
1314 --- postfix-1.1.2.orig/src/smtpd/smtpd_peer.c Thu Jul 5 22:09:47 2001
1315 +++ postfix-1.1.2/src/smtpd/smtpd_peer.c Mon Jan 28 12:40:04 2002
1320 +/* Utility library. */
1323 +#include <mymalloc.h>
1324 +#include <valid_hostname.h>
1325 +#include <stringops.h>
1327 +/* Global library. */
1330 * Older systems don't have h_errno. Even modern systems don't have
1336 -/* Utility library. */
1339 -#include <mymalloc.h>
1340 -#include <valid_hostname.h>
1341 -#include <stringops.h>
1343 -/* Global library. */
1347 +#define GAI_STRERROR(error) \
1348 + ((error = EAI_SYSTEM) ? gai_strerror(error) : strerror(errno))
1351 /* Application-specific. */
1354 @@ -102,10 +106,18 @@
1356 void smtpd_peer_init(SMTPD_STATE *state)
1358 - struct sockaddr_in sin;
1359 - SOCKADDR_SIZE len = sizeof(sin);
1361 + struct sockaddr_storage ss;
1363 + struct sockaddr ss;
1364 + struct in_addr *in;
1368 + struct sockaddr *sa;
1369 + SOCKADDR_SIZE len;
1371 + sa = (struct sockaddr *)&ss;
1375 * Avoid suprious complaints from Purify on Solaris.
1378 * Look up the peer address information.
1380 - if (getpeername(vstream_fileno(state->client),
1381 - (struct sockaddr *) & sin, &len) >= 0) {
1382 + if (getpeername(vstream_fileno(state->client), sa, &len) >= 0) {
1386 @@ -132,23 +143,56 @@
1388 * Look up and "verify" the client hostname.
1390 - else if (errno == 0 && sin.sin_family == AF_INET) {
1391 - state->addr = mystrdup(inet_ntoa(sin.sin_addr));
1392 - hp = gethostbyaddr((char *) &(sin.sin_addr),
1393 - sizeof(sin.sin_addr), AF_INET);
1395 + else if (errno == 0 && (sa->sa_family == AF_INET
1397 + || sa->sa_family == AF_INET6
1401 + char hbuf[NI_MAXHOST];
1402 + char abuf[NI_MAXHOST];
1403 + struct addrinfo hints, *rnull = NULL;
1405 + char abuf[sizeof("255.255.255.255") + 1];
1411 + (void)getnameinfo(sa, len, abuf, sizeof(hbuf), NULL, 0, NI_NUMERICHOST);
1413 + in = &((struct sockaddr_in *)sa)->sin_addr;
1414 + inet_ntop(AF_INET, in, abuf, sizeof(hbuf));
1416 + state->addr = mystrdup(abuf);
1418 + error = getnameinfo(sa, len, hbuf, sizeof(hbuf), NULL, 0, NI_NAMEREQD);
1421 + hp = gethostbyaddr((char *)in, sizeof(*in), AF_INET);
1424 + hbuf = mystrdup(hp->h_name);
1429 state->name = mystrdup("unknown");
1431 + state->peer_code = (error == EAI_AGAIN ? 4 : 5);
1433 state->peer_code = (h_errno == TRY_AGAIN ? 4 : 5);
1434 - } else if (valid_hostaddr(hp->h_name, DONT_GRIPE)) {
1436 + } else if (valid_hostaddr(hbuf, DONT_GRIPE)) {
1437 msg_warn("numeric result %s in address->name lookup for %s",
1438 - hp->h_name, state->addr);
1439 + hp->hbuf, state->addr);
1440 state->name = mystrdup("unknown");
1441 state->peer_code = 5;
1442 - } else if (!valid_hostname(hp->h_name, DONT_GRIPE)) {
1443 + } else if (!valid_hostname(hbuf, DONT_GRIPE)) {
1444 state->name = mystrdup("unknown");
1445 state->peer_code = 5;
1447 - state->name = mystrdup(hp->h_name); /* hp->name is clobbered!! */
1448 + state->name = mystrdup(hp->hbuf); /* hp->name is clobbered!! */
1449 state->peer_code = 2;
1452 @@ -150,16 +194,31 @@
1453 state->peer_code = code; \
1457 + memset(&hints, 0, sizeof(hints));
1458 + hints.ai_family = AF_UNSPEC;
1459 + hints.ai_socktype = SOCK_STREAM;
1460 + error = getaddrinfo(state->name, NULL, &hints, &rnull);
1462 + msg_warn("%s: hostname %s verification failed: %s",
1463 + state->addr, state->name, GAI_STRERROR(error));
1464 + REJECT_PEER_NAME(state, (error == EAI_AGAIN ? 4 : 5));
1466 + /* memcmp() isn't needed if we use getaddrinfo */
1468 + freeaddrinfo(rnull);
1470 hp = gethostbyname(state->name); /* clobbers hp->name!! */
1472 msg_warn("%s: hostname %s verification failed: %s",
1473 state->addr, state->name, HSTRERROR(h_errno));
1474 REJECT_PEER_NAME(state, (h_errno == TRY_AGAIN ? 4 : 5));
1475 - } else if (hp->h_length != sizeof(sin.sin_addr)) {
1476 + } else if (hp->h_length != sizeof(*in)) {
1477 msg_warn("%s: hostname %s verification failed: bad address size %d",
1478 state->addr, state->name, hp->h_length);
1479 REJECT_PEER_NAME(state, 5);
1482 for (i = 0; /* void */ ; i++) {
1483 if (hp->h_addr_list[i] == 0) {
1484 msg_warn("%s: address not listed for hostname %s",
1485 @@ -167,12 +226,11 @@
1486 REJECT_PEER_NAME(state, 5);
1489 - if (memcmp(hp->h_addr_list[i],
1490 - (char *) &sin.sin_addr,
1491 - sizeof(sin.sin_addr)) == 0)
1492 + if (memcmp(hp->h_addr_list[i], (char *)in, sizeof(*in)) == 0)
1493 break; /* keep peer name */
1500 diff -Nur postfix-1.1.2.orig/src/smtpstone/smtp-sink.c postfix-1.1.2/src/smtpstone/smtp-sink.c
1501 --- postfix-1.1.2.orig/src/smtpstone/smtp-sink.c Thu Nov 8 21:15:32 2001
1502 +++ postfix-1.1.2/src/smtpstone/smtp-sink.c Mon Jan 28 12:40:04 2002
1505 if (strncmp(argv[optind], "inet:", 5) == 0)
1507 - sock = inet_listen(argv[optind], backlog, BLOCKING);
1508 + sock = inet_listen(argv[optind], backlog, BLOCKING, 1);
1512 diff -Nur postfix-1.1.2.orig/src/util/Makefile.in postfix-1.1.2/src/util/Makefile.in
1513 --- postfix-1.1.2.orig/src/util/Makefile.in Mon Jan 28 12:38:34 2002
1514 +++ postfix-1.1.2/src/util/Makefile.in Mon Jan 28 12:41:17 2002
1516 dict_tcp.c dict_unix.c dir_forest.c doze.c duplex_pipe.c \
1517 environ.c events.c exec_command.c fifo_listen.c fifo_trigger.c \
1518 file_limit.c find_inet.c fsspace.c fullname.c get_domainname.c \
1519 - get_hostname.c hex_quote.c htable.c inet_addr_host.c \
1520 + get_hostname.c get_port.c hex_quote.c htable.c inet_addr_host.c \
1521 inet_addr_list.c inet_addr_local.c inet_connect.c inet_listen.c \
1522 inet_trigger.c inet_util.c intv.c line_wrap.c lowercase.c \
1523 lstat_as.c mac_expand.c mac_parse.c make_dirs.c match_list.c \
1525 dict_tcp.o dict_unix.o dir_forest.o doze.o duplex_pipe.o \
1526 environ.o events.o exec_command.o fifo_listen.o fifo_trigger.o \
1527 file_limit.o find_inet.o fsspace.o fullname.o get_domainname.o \
1528 - get_hostname.o hex_quote.o htable.o inet_addr_host.o \
1529 + get_hostname.o get_port.o hex_quote.o htable.o inet_addr_host.o \
1530 inet_addr_list.o inet_addr_local.o inet_connect.o inet_listen.o \
1531 inet_trigger.o inet_util.o intv.o line_wrap.o lowercase.o \
1532 lstat_as.o mac_expand.o mac_parse.o make_dirs.o match_list.o \
1534 dict_ht.h dict_ldap.h dict_mysql.h dict_ni.h dict_nis.h \
1535 dict_nisplus.h dict_pcre.h dict_regexp.h dict_static.h dict_tcp.h \
1536 dict_unix.h dir_forest.h events.h exec_command.h find_inet.h \
1537 - fsspace.h fullname.h get_domainname.h get_hostname.h hex_quote.h \
1538 + fsspace.h fullname.h get_domainname.h get_hostname.h get_port.h hex_quote.h \
1539 htable.h inet_addr_host.h inet_addr_list.h inet_addr_local.h \
1540 inet_util.h intv.h iostuff.h line_wrap.h listen.h lstat_as.h \
1541 mac_expand.h mac_parse.h make_dirs.h match_list.h match_ops.h \
1543 get_domainname.o: mymalloc.h
1544 get_domainname.o: get_hostname.h
1545 get_domainname.o: get_domainname.h
1546 +get_port.o: sys_defs.h
1547 get_hostname.o: get_hostname.c
1548 get_hostname.o: sys_defs.h
1549 get_hostname.o: mymalloc.h
1551 match_list.o: stringops.h
1552 match_list.o: argv.h
1553 match_list.o: dict.h
1554 +match_list.o: inet_util.h
1555 match_list.o: match_ops.h
1556 match_list.o: match_list.h
1557 match_ops.o: match_ops.c
1558 diff -Nur postfix-1.1.2.orig/src/util/get_port.c postfix-1.1.2/src/util/get_port.c
1559 --- postfix-1.1.2.orig/src/util/get_port.c Thu Jan 1 01:00:00 1970
1560 +++ postfix-1.1.2/src/util/get_port.c Mon Jan 28 12:40:04 2002
1566 +/* trivial host and port extracter
1568 +/* #include <get_port.h>
1570 +/* char *get_port(data)
1574 +/* get_port() extract host name or ip address from
1575 +/* strings such as [3ffe:902:12::10]:25, [::1]
1576 +/* or 192.168.0.1:25, and null-terminates the
1577 +/* \fIdata\fR at the first occurrence of port separator.
1579 +/* If port not found return null pointer.
1583 +/* BSD Style (or BSD like) license.
1585 +/* Arkadiusz Mi¶kiewicz <misiek@pld.org.pl>
1589 +/* System libraries */
1591 +#include <sys_defs.h>
1592 +#include <string.h>
1594 +/* Utility library. */
1596 +#include "get_port.h"
1598 +/* get_port - extract port number from string */
1600 +char *get_port(char *data)
1602 + const char *escl=strchr(data,'[');
1603 + const char *sepl=strchr(data,':');
1604 + char *escr=strrchr(data,']');
1605 + char *sepr=strrchr(data,':');
1607 + /* extract from "[address]:port" or "[address]"*/
1610 + memmove(data, data + 1, strlen(data) - strlen(escr));
1611 + data[strlen(data) - strlen(escr) - 1] = 0;
1615 + return (*escr ? escr : NULL);
1617 + /* extract from "address:port" or "address" */
1618 + if ((sepl == sepr) && sepr && sepl)
1624 + /* return empty string */
1627 diff -Nur postfix-1.1.2.orig/src/util/get_port.h postfix-1.1.2/src/util/get_port.h
1628 --- postfix-1.1.2.orig/src/util/get_port.h Thu Jan 1 01:00:00 1970
1629 +++ postfix-1.1.2/src/util/get_port.h Mon Jan 28 12:40:04 2002
1631 +#ifndef _GET_PORT_H_INCLUDED_
1632 +#define _GET_PORT_H_INCLUDED_
1638 +/* trivial host and port extracter
1640 +/* #include <get_port.h>
1644 + /* External interface. */
1646 +extern char *get_port(char *);
1652 +/* BSD Style (or BSD like) license.
1654 +/* Arkadiusz Mi¶kiewicz <misiek@pld.org.pl>
1659 diff -Nur postfix-1.1.2.orig/src/util/inet_addr_host.c postfix-1.1.2/src/util/inet_addr_host.c
1660 --- postfix-1.1.2.orig/src/util/inet_addr_host.c Fri Dec 11 19:55:35 1998
1661 +++ postfix-1.1.2/src/util/inet_addr_host.c Mon Jan 28 12:40:04 2002
1663 #include <sys_defs.h>
1664 #include <netinet/in.h>
1665 #include <arpa/inet.h>
1666 +#include <sys/socket.h>
1668 +#include <stdlib.h>
1669 +#include <string.h>
1672 #define INADDR_NONE 0xffffffff
1675 #include <inet_addr_list.h>
1676 #include <inet_addr_host.h>
1681 /* inet_addr_host - look up address list for host */
1683 int inet_addr_host(INET_ADDR_LIST *addr_list, const char *hostname)
1687 + struct addrinfo hints, *res0, *res;
1689 + char buforhosta[1024];
1694 struct in_addr addr;
1696 int initial_count = addr_list->used;
1699 + memset(&hints, 0, sizeof(hints));
1700 + hints.ai_family = PF_UNSPEC;
1701 + hints.ai_socktype = SOCK_DGRAM;
1702 + error = getaddrinfo(hostname, NULL, &hints, &res0);
1704 + for (res = res0; res; res = res->ai_next) {
1705 + if(res->ai_family != AF_INET && res->ai_family != AF_INET6)
1707 + /* filter out address families that are not supported */
1708 + s = socket(res->ai_family, SOCK_DGRAM, 0);
1713 + inet_addr_list_append(addr_list, res->ai_addr);
1715 + freeaddrinfo(res0);
1718 if ((addr.s_addr = inet_addr(hostname)) != INADDR_NONE) {
1719 inet_addr_list_append(addr_list, &addr);
1722 inet_addr_list_append(addr_list,
1723 (struct in_addr *) * hp->h_addr_list++);
1727 return (addr_list->used - initial_count);
1736 INET_ADDR_LIST addr_list;
1738 + struct sockaddr *sa;
1739 + char hbuf[NI_MAXHOST];
1741 msg_vstream_init(argv[0], VSTREAM_ERR);
1744 if (inet_addr_host(&addr_list, *argv) == 0)
1745 msg_fatal("not found: %s", *argv);
1747 - for (i = 0; i < addr_list.used; i++)
1748 - vstream_printf("%s\n", inet_ntoa(addr_list.addrs[i]));
1749 + for (i = 0; i < addr_list.used; i++) {
1750 + sa = (struct sockaddr *)&addr_list.addrs[i];
1751 + getnameinfo(sa, SA_LEN(sa), hbuf, sizeof(hbuf), NULL, 0,
1753 + vstream_printf("%s\n", hbuf);
1755 vstream_fflush(VSTREAM_OUT);
1757 inet_addr_list_free(&addr_list);
1758 diff -Nur postfix-1.1.2.orig/src/util/inet_addr_list.c postfix-1.1.2/src/util/inet_addr_list.c
1759 --- postfix-1.1.2.orig/src/util/inet_addr_list.c Tue Jul 31 20:13:41 2001
1760 +++ postfix-1.1.2/src/util/inet_addr_list.c Mon Jan 28 12:40:04 2002
1762 #include <arpa/inet.h>
1768 +#include <string.h>
1769 +#include <sys/socket.h>
1772 /* Utility library. */
1780 + list->addrs = (struct sockaddr_storage *)
1782 list->addrs = (struct in_addr *)
1784 mymalloc(sizeof(*list->addrs) * list->size);
1787 /* inet_addr_list_append - append address to internet address list */
1790 +void inet_addr_list_append(INET_ADDR_LIST *list,
1791 + struct sockaddr * addr)
1793 + char *myname = "inet_addr_list_append";
1794 + char hbuf[NI_MAXHOST];
1796 + if (msg_verbose > 1) {
1797 + if (getnameinfo(addr, SA_LEN(addr), hbuf, sizeof(hbuf), NULL, 0,
1798 + NI_NUMERICHOST)) {
1799 + strncpy(hbuf, "??????", sizeof(hbuf));
1801 + msg_info("%s: %s", myname, hbuf);
1804 + if (list->used >= list->size)
1806 + list->addrs = (struct sockaddr_storage *)
1807 + myrealloc((char *) list->addrs,
1808 + sizeof(*list->addrs) * list->size);
1809 + memcpy(&list->addrs[list->used++], addr, SA_LEN(addr));
1812 void inet_addr_list_append(INET_ADDR_LIST *list, struct in_addr * addr)
1814 char *myname = "inet_addr_list_append";
1815 @@ -83,15 +117,22 @@
1816 sizeof(*list->addrs) * list->size);
1817 list->addrs[list->used++] = *addr;
1821 /* inet_addr_list_comp - compare addresses */
1823 static int inet_addr_list_comp(const void *a, const void *b)
1826 + if(((struct sockaddr*)a)->sa_family != ((struct sockaddr*)b)->sa_family)
1827 + return ( ((struct sockaddr*)a)->sa_family - ((struct sockaddr*)b)->sa_family );
1828 + return memcmp(a,b,SA_LEN((struct sockaddr*)a));
1830 const struct in_addr *a_addr = (const struct in_addr *) a;
1831 const struct in_addr *b_addr = (const struct in_addr *) b;
1833 return (a_addr->s_addr - b_addr->s_addr);
1837 /* inet_addr_list_uniq - weed out duplicates */
1838 diff -Nur postfix-1.1.2.orig/src/util/inet_addr_list.h postfix-1.1.2/src/util/inet_addr_list.h
1839 --- postfix-1.1.2.orig/src/util/inet_addr_list.h Tue Jul 31 19:56:47 2001
1840 +++ postfix-1.1.2/src/util/inet_addr_list.h Mon Jan 28 12:40:04 2002
1843 #include <netinet/in.h>
1847 +#define SA_LEN(x) (((x)->sa_family == AF_INET6) ? sizeof(struct sockaddr_in6) : sizeof(struct sockaddr_in))
1848 +#define SS_LEN(x) (((x).ss_family == AF_INET6) ? sizeof(struct sockaddr_in6) : sizeof(struct sockaddr_in))
1850 +#define SA_LEN(x) ((x)->sa_len)
1851 +#define SS_LEN(x) ((x).ss_len)
1856 * External interface.
1858 typedef struct INET_ADDR_LIST {
1859 int used; /* nr of elements in use */
1860 int size; /* actual list size */
1862 + struct sockaddr_storage *addrs; /* payload */
1864 struct in_addr *addrs; /* payload */
1868 extern void inet_addr_list_init(INET_ADDR_LIST *);
1869 extern void inet_addr_list_free(INET_ADDR_LIST *);
1870 extern void inet_addr_list_uniq(INET_ADDR_LIST *);
1873 +extern void inet_addr_list_append(INET_ADDR_LIST *, struct sockaddr *);
1875 extern void inet_addr_list_append(INET_ADDR_LIST *, struct in_addr *);
1880 diff -Nur postfix-1.1.2.orig/src/util/inet_addr_local.c postfix-1.1.2/src/util/inet_addr_local.c
1881 --- postfix-1.1.2.orig/src/util/inet_addr_local.c Sun Feb 25 19:20:19 2001
1882 +++ postfix-1.1.2/src/util/inet_addr_local.c Mon Jan 28 12:40:04 2002
1887 +#if defined(INET6) && (defined (LINUX) || defined (LINUX2))
1891 +#ifdef HAVE_GETIFADDRS
1892 +#include <ifaddrs.h>
1895 /* Utility library. */
1897 @@ -78,18 +85,104 @@
1899 int inet_addr_local(INET_ADDR_LIST *addr_list, INET_ADDR_LIST *mask_list)
1901 +#ifdef HAVE_GETIFADDRS
1902 + char *myname = "inet_addr_local";
1903 + struct ifaddrs *ifap, *ifa;
1904 + int initial_count = addr_list->used;
1905 + struct sockaddr *sa, *sam;
1908 + struct sockaddr_in6 addr6;
1911 + void *addr,*addrm;
1914 + if (getifaddrs(&ifap) < 0)
1915 + msg_fatal("%s: getifaddrs: %m", myname);
1917 + for (ifa = ifap; ifa; ifa = ifa->ifa_next) {
1918 + if (! (ifa->ifa_flags & IFF_RUNNING) || ifa->ifa_addr==NULL)
1920 + sa = ifa->ifa_addr;
1921 + sam = ifa->ifa_netmask;
1922 + switch (ifa->ifa_addr->sa_family) {
1925 + addr = (void *)&((struct sockaddr_in *)ifa->ifa_addr)->sin_addr;
1926 + addrm = (void *)&((struct sockaddr_in *)ifa->ifa_netmask)->sin_addr;
1932 + memcpy(&addr6, ifa->ifa_addr, ifa->ifa_addr->sa_len);
1933 + /* decode scoped address notation */
1934 + if ((IN6_IS_ADDR_LINKLOCAL(&addr6.sin6_addr) ||
1935 + IN6_IS_ADDR_SITELOCAL(&addr6.sin6_addr)) &&
1936 + addr6.sin6_scope_id == 0) {
1937 + addr6.sin6_scope_id = ntohs(addr6.sin6_addr.s6_addr[3] |
1938 + (unsigned int)addr6.sin6_addr.s6_addr[2] << 8);
1939 + addr6.sin6_addr.s6_addr[2] = addr6.sin6_addr.s6_addr[3] = 0;
1940 + sa = (struct sockaddr *)&addr6;
1950 + inet_addr_list_append(addr_list, sa);
1951 + if (mask_list != NULL)
1952 + inet_addr_list_append(mask_list, sam);
1954 + inet_addr_list_append(addr_list, (struct in_addr *)addr);
1955 + if (mask_list != NULL)
1956 + inet_addr_list_append(mask_list, (struct in_addr *)addrm);
1960 + freeifaddrs(ifap);
1961 + return (addr_list->used - initial_count);
1963 char *myname = "inet_addr_local";
1966 struct ifreq *the_end;
1968 - VSTRING *buf = vstring_alloc(1024);
1970 int initial_count = addr_list->used;
1971 struct in_addr addr;
1972 struct ifreq *ifr_mask;
1975 +#if defined (LINUX) || defined (LINUX2)
1976 +#define _PATH_PROCNET_IFINET6 "/proc/net/if_inet6"
1978 + char addr6p[8][5], addr6res[40], devname[20];
1979 + int plen, scope, dad_status, if_idx, gaierror;
1980 + struct addrinfo hints, *res, *res0;
1982 + struct sockaddr_in6 addr6;
1984 - if ((sock = socket(PF_INET, SOCK_DGRAM, 0)) < 0)
1987 + buf = vstring_alloc(1024);
1989 + if ((sock = socket(af, SOCK_DGRAM, 0)) < 0) {
1991 + if (af == AF_INET6)
1994 + msg_warn("%s: socket: %m", myname);
1999 msg_fatal("%s: socket: %m", myname);
2003 * Get the network interface list. XXX The socket API appears to have no
2004 @@ -126,10 +213,15 @@
2006 the_end = (struct ifreq *) (ifc.ifc_buf + ifc.ifc_len);
2007 for (ifr = ifc.ifc_req; ifr < the_end;) {
2008 - if (ifr->ifr_addr.sa_family == AF_INET) { /* IP interface */
2009 + if ((ifr->ifr_addr.sa_family == AF_INET) &&
2010 + (ifr->ifr_addr.sa_family == af)) { /* IP interface */
2011 addr = ((struct sockaddr_in *) & ifr->ifr_addr)->sin_addr;
2012 if (addr.s_addr != INADDR_ANY) { /* has IP address */
2014 + inet_addr_list_append(addr_list, &ifr->ifr_addr);
2016 inet_addr_list_append(addr_list, &addr);
2019 ifr_mask = (struct ifreq *) mymalloc(IFREQ_SIZE(ifr));
2020 memcpy((char *) ifr_mask, (char *) ifr, IFREQ_SIZE(ifr));
2021 @@ -141,11 +233,61 @@
2026 + else if ((ifr->ifr_addr.sa_family == AF_INET6) &&
2027 + (ifr->ifr_addr.sa_family == af)) { /* IPv6 interface */
2028 + addr6 = *((struct sockaddr_in6 *) & ifr->ifr_addr);
2030 + /* decode scoped address notation */
2031 + if ((IN6_IS_ADDR_LINKLOCAL(&addr6.sin6_addr) ||
2032 + IN6_IS_ADDR_SITELOCAL(&addr6.sin6_addr)) &&
2033 + addr6.sin6_scope_id == 0) {
2034 + addr6.sin6_scope_id = ntohs(addr6.sin6_addr.s6_addr[3] |
2035 + (unsigned int)addr6.sin6_addr.s6_addr[2] << 8);
2036 + addr6.sin6_addr.s6_addr[2] = addr6.sin6_addr.s6_addr[3] = 0;
2039 + if (!(IN6_IS_ADDR_UNSPECIFIED(&addr6.sin6_addr)))
2040 + inet_addr_list_append(addr_list, (struct sockaddr *)&addr6);
2043 ifr = NEXT_INTERFACE(ifr);
2049 + if (af != AF_INET6) {
2051 + goto other_socket_type;
2053 +#if defined (LINUX) || defined (LINUX2)
2054 + if ((f = fopen(_PATH_PROCNET_IFINET6, "r")) != NULL) {
2055 + while (fscanf(f, "%4s%4s%4s%4s%4s%4s%4s%4s %02x %02x %02x %02x %20s\n",
2056 + addr6p[0], addr6p[1], addr6p[2], addr6p[3], addr6p[4],
2057 + addr6p[5], addr6p[6], addr6p[7],
2058 + &if_idx, &plen, &scope, &dad_status, devname) != EOF) {
2059 + sprintf(addr6res, "%s:%s:%s:%s:%s:%s:%s:%s",
2060 + addr6p[0], addr6p[1], addr6p[2], addr6p[3],
2061 + addr6p[4], addr6p[5], addr6p[6], addr6p[7]);
2062 + addr6res[sizeof(addr6res) - 1] = 0;
2063 + memset(&hints, 0, sizeof(hints));
2064 + hints.ai_flags = AI_NUMERICHOST;
2065 + hints.ai_family = AF_UNSPEC;
2066 + hints.ai_socktype = SOCK_DGRAM;
2067 + gaierror = getaddrinfo(addr6res, NULL, &hints, &res0);
2069 + for (res = res0; res; res = res->ai_next) {
2070 + inet_addr_list_append(addr_list, res->ai_addr);
2072 + freeaddrinfo(res0);
2078 return (addr_list->used - initial_count);
2084 INET_ADDR_LIST addr_list;
2085 INET_ADDR_LIST mask_list;
2087 + char abuf[NI_MAXHOST], mbuf[NI_MAXHOST];
2088 + struct sockaddr *sa;
2090 msg_vstream_init(argv[0], VSTREAM_ERR);
2092 @@ -172,8 +316,17 @@
2093 msg_warn("found only one active network interface");
2095 for (i = 0; i < addr_list.used; i++) {
2096 - vstream_printf("%s/", inet_ntoa(addr_list.addrs[i]));
2097 - vstream_printf("%s\n", inet_ntoa(mask_list.addrs[i]));
2098 + sa = (struct sockaddr *)&addr_list.addrs[i];
2099 + if (getnameinfo(sa, SA_LEN(sa), abuf, sizeof(abuf), NULL, 0,
2100 + NI_NUMERICHOST)) {
2101 + strncpy(abuf, "???", sizeof(abuf));
2103 + sa = (struct sockaddr *)&mask_list.addrs[i];
2104 + if (getnameinfo(sa, SA_LEN(sa), mbuf, sizeof(mbuf), NULL, 0,
2105 + NI_NUMERICHOST)) {
2106 + strncpy(mbuf, "???", sizeof(mbuf));
2108 + vstream_printf("%s/%s\n", abuf, mbuf);
2110 vstream_fflush(VSTREAM_OUT);
2111 inet_addr_list_free(&addr_list);
2112 diff -Nur postfix-1.1.2.orig/src/util/inet_connect.c postfix-1.1.2/src/util/inet_connect.c
2113 --- postfix-1.1.2.orig/src/util/inet_connect.c Mon Nov 20 19:06:31 2000
2114 +++ postfix-1.1.2/src/util/inet_connect.c Mon Jan 28 12:40:04 2002
2123 /* Utility library. */
2130 + struct addrinfo hints, *res, *res0;
2133 struct sockaddr_in sin;
2141 buf = inet_parse(addr, &host, &port);
2145 + memset(&hints, 0, sizeof(hints));
2146 + hints.ai_family = PF_UNSPEC;
2147 + hints.ai_socktype = SOCK_STREAM;
2148 + hints.ai_flags = AI_NUMERICHOST; /* find_inet_addr is numeric only */
2149 + if (getaddrinfo(host, port, &hints, &res0))
2150 + msg_fatal("host not found: %s", host);
2154 memset((char *) &sin, 0, sizeof(sin));
2155 sin.sin_family = AF_INET;
2156 sin.sin_addr.s_addr = find_inet_addr(host);
2157 sin.sin_port = find_inet_port(port, "tcp");
2163 + for (res = res0; res; res = res->ai_next) {
2164 + if ((res->ai_family != AF_INET) && (res->ai_family != AF_INET6))
2167 + sock = socket(res->ai_family, res->ai_socktype, res->ai_protocol);
2170 + if (timeout > 0) {
2171 + non_blocking(sock, NON_BLOCKING);
2172 + if (timed_connect(sock, res->ai_addr, res->ai_addrlen, timeout) < 0) {
2177 + if (block_mode != NON_BLOCKING)
2178 + non_blocking(sock, block_mode);
2181 + non_blocking(sock, block_mode);
2182 + if (connect(sock, res->ai_addr, res->ai_addrlen) < 0
2183 + && errno != EINPROGRESS) {
2191 + freeaddrinfo(res0);
2195 * Create a client socket.
2203 diff -Nur postfix-1.1.2.orig/src/util/inet_listen.c postfix-1.1.2/src/util/inet_listen.c
2204 --- postfix-1.1.2.orig/src/util/inet_listen.c Mon Nov 20 19:06:32 2000
2205 +++ postfix-1.1.2/src/util/inet_listen.c Mon Jan 28 12:40:04 2002
2208 /* #include <listen.h>
2210 -/* int inet_listen(addr, backlog, block_mode)
2211 +/* int inet_listen(addr, backlog, block_mode, addinuse_fatal)
2212 /* const char *addr;
2216 #include <sys_defs.h>
2217 #include <sys/socket.h>
2218 #include <netinet/in.h>
2220 +#if (! __GLIBC__ >= 2 && __GLIBC_MINOR__ >=1 )
2221 +#include <netinet6/in6.h>
2224 #include <arpa/inet.h>
2226 #ifndef MAXHOSTNAMELEN
2227 #include <sys/param.h>
2233 @@ -77,35 +83,116 @@
2235 /* inet_listen - create inet-domain listener */
2237 -int inet_listen(const char *addr, int backlog, int block_mode)
2238 +int inet_listen(const char *addr, int backlog, int block_mode, int addrinuse_fatal)
2241 + struct addrinfo *res, *res0, hints;
2248 + struct sockaddr *ai_addr;
2249 + SOCKADDR_SIZE ai_addrlen;
2250 + struct ai *ai_next;
2251 + } *res, *res0, resbody;
2252 struct sockaddr_in sin;
2256 + int addrinuse = 0;
2261 + char hbuf[NI_MAXHOST], pbuf[NI_MAXSERV];
2263 + char hbuf[sizeof("255.255.255.255") + 1];
2264 + char pbuf[sizeof("255.255.255.255") + 1];
2266 + char *cause = "unknown";
2269 * Translate address information to internal form.
2271 buf = inet_parse(addr, &host, &port);
2272 - memset((char *) &sin, 0, sizeof(sin));
2274 + memset(&hints, 0, sizeof(hints));
2275 + hints.ai_flags = AI_PASSIVE;
2276 + hints.ai_family = AF_UNSPEC;
2277 + hints.ai_socktype = SOCK_STREAM;
2278 + error = getaddrinfo(*host ? host : NULL, *port ? port : "0", &hints, &res0);
2280 + msg_fatal("getaddrinfo: %s", gai_strerror(error));
2284 + memset(&sin, 0, sizeof(sin));
2285 sin.sin_family = AF_INET;
2287 + sin.sin_len = sizeof(sin);
2289 sin.sin_port = find_inet_port(port, "tcp");
2290 sin.sin_addr.s_addr = (*host ? find_inet_addr(host) : INADDR_ANY);
2294 - * Create a listener socket.
2296 - if ((sock = socket(AF_INET, SOCK_STREAM, 0)) < 0)
2297 - msg_fatal("socket: %m");
2298 - if (setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, (char *) &t, sizeof(t)) < 0)
2299 - msg_fatal("setsockopt: %m");
2300 - if (bind(sock, (struct sockaddr *) & sin, sizeof(sin)) < 0)
2301 - msg_fatal("bind %s port %d: %m", sin.sin_addr.s_addr == INADDR_ANY ?
2302 - "INADDR_ANY" : inet_ntoa(sin.sin_addr), ntohs(sin.sin_port));
2303 + memset(&resbody, 0, sizeof(resbody));
2304 + resbody.ai_socktype = SOCK_STREAM;
2305 + resbody.ai_family = AF_INET;
2306 + resbody.ai_addr = (struct sockaddr *)&sin;
2307 + resbody.ai_addrlen = sizeof(sin);
2313 + for (res = res0; res; res = res->ai_next) {
2314 + if ((res->ai_family != AF_INET) && (res->ai_family != AF_INET6))
2318 + * Create a listener socket.
2320 + if ((sock = socket(res->ai_family, res->ai_socktype, 0)) < 0) {
2325 + if (res->ai_family == AF_INET6 &&
2326 + setsockopt(sock, IPPROTO_IPV6, IPV6_V6ONLY, (char *) &t, sizeof(t)) < 0) {
2327 + /* if kernel/libc don't support this simple ignore it
2328 + cause = "setsockopt(IPV6_V6ONLY)";
2336 + if (setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, (char *) &t, sizeof(t)) < 0) {
2337 + cause = "setsockopt(SO_REUSEADDR)";
2343 + if (bind(sock, res->ai_addr, res->ai_addrlen) < 0) {
2345 + if (errno == EADDRINUSE)
2353 + if (sock < 0 && (addrinuse_fatal || !addrinuse))
2354 + msg_fatal("%s: %m", cause);
2356 + freeaddrinfo(res0);
2360 non_blocking(sock, block_mode);
2361 if (listen(sock, backlog) < 0)
2362 msg_fatal("listen: %m");
2363 diff -Nur postfix-1.1.2.orig/src/util/listen.h postfix-1.1.2/src/util/listen.h
2364 --- postfix-1.1.2.orig/src/util/listen.h Mon Mar 22 02:57:11 1999
2365 +++ postfix-1.1.2/src/util/listen.h Mon Jan 28 12:40:04 2002
2367 * Listener external interface.
2369 extern int unix_listen(const char *, int, int);
2370 -extern int inet_listen(const char *, int, int);
2371 +extern int inet_listen(const char *, int, int, int);
2372 extern int fifo_listen(const char *, int, int);
2373 extern int stream_listen(const char *, int, int);
2375 diff -Nur postfix-1.1.2.orig/src/util/match_list.c postfix-1.1.2/src/util/match_list.c
2376 --- postfix-1.1.2.orig/src/util/match_list.c Tue Nov 20 21:07:15 2001
2377 +++ postfix-1.1.2/src/util/match_list.c Mon Jan 28 12:40:04 2002
2379 list = match_list_parse(list, vstring_str(buf));
2380 if (vstream_fclose(fp))
2381 msg_fatal("%s: read file %s: %m", myname, pattern);
2382 - } else if (strchr(pattern, ':') != 0) { /* type:table */
2383 + } else if ((strchr(pattern, ']') == 0) && (strchr(pattern, ':') != 0)) { /* type:table */
2384 for (cp = pattern; *cp == '!'; cp++)
2386 if (dict_handle(pattern) == 0)
2387 diff -Nur postfix-1.1.2.orig/src/util/match_ops.c postfix-1.1.2/src/util/match_ops.c
2388 --- postfix-1.1.2.orig/src/util/match_ops.c Tue Nov 20 21:16:10 2001
2389 +++ postfix-1.1.2/src/util/match_ops.c Mon Jan 28 12:40:04 2002
2391 #include <match_ops.h>
2392 #include <stringops.h>
2398 + * This program is free software; you can redistribute it and/or
2399 + * modify it under the terms of the GNU General Public License
2400 + * as published by the Free Software Foundation; either version
2401 + * 2 of the License, or (at your option) any later version.
2403 + * Authors: Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
2406 + * Artur Frysiak <wiget@pld.org.pl>
2407 + * Arkadiusz Mi¶kiewicz <misiek@pld.org.pl>
2411 +#include <stdlib.h>
2412 +#include <unistd.h>
2413 +#include <syslog.h>
2415 +#include <sys/socket.h>
2416 +#include <netinet/in.h>
2417 +#include <string.h>
2419 +#include <arpa/inet.h>
2420 +#include <resolv.h>
2423 +#define AF_DECnet 12
2427 +#define PF_PACKET 17
2432 + unsigned char family;
2433 + unsigned char bytelen;
2434 + signed short bitlen;
2435 + unsigned int data[4];
2439 +int masked_match(char *, char *, char *);
2440 +int get_integer(int *, char *, int);
2441 +int get_addr_1(inet_prefix *, char *, int);
2442 +int get_prefix_1(inet_prefix *, char *, int);
2443 +int get_addr(inet_prefix *, char *, int);
2444 +int get_prefix(inet_prefix *, char *, int);
2445 +unsigned int get_addr32(char *);
2446 +int matches(char *, char *);
2447 +int inet_addr_match(inet_prefix *, inet_prefix *, int);
2448 +int mask_match(char *, char *, char *);
2450 +int get_integer(int *val, char *arg, int base)
2455 + if (!arg || !*arg)
2457 + res = strtol(arg, &ptr, base);
2458 + if (!ptr || ptr == arg || *ptr || res > INT_MAX || res < INT_MIN)
2464 +int get_addr_1(inet_prefix *addr, char *name, int family)
2467 + unsigned char *ap = (unsigned char*)addr->data;
2470 + memset(addr, 0, sizeof(*addr));
2472 + if (strcmp(name, "default") == 0 || strcmp(name, "any") == 0) {
2473 + if (family == AF_DECnet)
2475 + addr->family = family;
2476 + addr->bytelen = (family == AF_INET6 ? 16 : 4);
2477 + addr->bitlen = -1;
2481 + if (strchr(name, ':')) {
2482 + addr->family = AF_INET6;
2483 + if (family != AF_UNSPEC && family != AF_INET6)
2485 + if (inet_pton(AF_INET6, name, addr->data) <= 0)
2487 + addr->bytelen = 16;
2488 + addr->bitlen = -1;
2491 + addr->family = AF_INET;
2492 + if (family != AF_UNSPEC && family != AF_INET)
2494 + addr->bytelen = 4;
2495 + addr->bitlen = -1;
2496 + for (cp = name, i = 0; *cp; cp++) {
2497 + if (*cp <= '9' && *cp >= '0') {
2498 + ap[i] = 10*ap[i] + (*cp-'0');
2501 + if (*cp == '.' && ++i <= 3)
2508 +int get_prefix_1(inet_prefix *dst, char *arg, int family)
2514 + memset(dst, 0, sizeof(*dst));
2516 + if (strcmp(arg, "default") == 0 || strcmp(arg, "any") == 0) {
2517 + if (family == AF_DECnet)
2519 + dst->family = family;
2525 + slash = strchr(arg, '/');
2528 + err = get_addr_1(dst, arg, family);
2530 + switch(dst->family) {
2532 + dst->bitlen = 128;
2542 + if (get_integer(&plen, slash+1, 0) || plen > dst->bitlen) {
2546 + dst->bitlen = plen;
2555 +int get_addr(inet_prefix *dst, char *arg, int family)
2558 + if (family == AF_PACKET)
2561 + if (get_addr_1(dst, arg, family))
2566 +int get_prefix(inet_prefix *dst, char *arg, int family)
2569 + if (family == AF_PACKET)
2572 + if (get_prefix_1(dst, arg, family))
2577 +unsigned int get_addr32(char *name)
2580 + if (get_addr_1(&addr, name, AF_INET))
2582 + return addr.data[0];
2585 +int matches(char *cmd, char *pattern)
2587 + int len = strlen(cmd);
2588 + if (len > strlen(pattern))
2590 + return memcmp(pattern, cmd, len);
2593 +int inet_addr_match(inet_prefix *a, inet_prefix *b, int bits)
2595 + unsigned int *a1 = a->data;
2596 + unsigned int *a2 = b->data;
2597 + int words = bits >> 0x05;
2602 + if (memcmp(a1, a2, words << 2))
2606 + unsigned int w1, w2;
2607 + unsigned int mask;
2612 + mask = htonl((0xffffffff) << (0x20 - bits));
2614 + if ((w1 ^ w2) & mask)
2621 +/* zero if matches */
2622 +int mask_match(char *network, char *cprefix, char *address)
2624 + inet_prefix *inetwork;
2625 + inet_prefix *iaddress;
2628 + if (!(network && address && cprefix))
2630 + prefix = strtol(cprefix, (char **)NULL, 10);
2631 + if ((prefix < 0) || (prefix > 128))
2633 + if ((strlen(network) == 0) || (strlen(address) == 0))
2636 + inetwork = malloc(sizeof(inet_prefix));
2637 + iaddress = malloc(sizeof(inet_prefix));
2639 + if ((get_addr(iaddress, address, AF_UNSPEC) >= 0)
2640 + && (get_addr(inetwork, network, AF_UNSPEC) >= 0))
2641 + ret = inet_addr_match(inetwork, iaddress, prefix);
2647 + /* 1 if matches */
2648 + /* return (!ret); */
2649 + /* 0 if matches */
2654 + * masked_match() - universal for IPv4 and IPv6 - 1 if matches
2656 +int masked_match(net_tok, mask_tok, string)
2662 + struct in6_addr in6[2];
2663 + char v4addr[2][INET_ADDRSTRLEN];
2668 + /* Check for NULL */
2669 + if (!(net_tok && mask_tok && string))
2670 + return 0; /* doesn't match!!! */
2672 + /* If IPv6 mapped convert to native-IPv4 */
2674 + if (inet_pton(AF_INET6, net_tok, &in6[0]) == 1 &&
2675 + inet_pton(AF_INET6, string, &in6[1]) == 1 &&
2676 + IN6_IS_ADDR_V4MAPPED(&in6[0]) && IN6_IS_ADDR_V4MAPPED(&in6[1])) {
2677 + plen = atoi(mask_tok);
2678 + if (32 < plen && plen < 129) {
2679 + sprintf(newmask, "%d", plen - 96);
2680 + mask_tok = newmask;
2683 + (void)inet_ntop(AF_INET, &in6[0].s6_addr[12], v4addr[0],
2684 + sizeof(v4addr[0]));
2685 + net_tok = v4addr[0];
2686 + (void)inet_ntop(AF_INET, &in6[1].s6_addr[12], v4addr[1],
2687 + sizeof(v4addr[1]));
2688 + string = v4addr[1];
2691 + return (!mask_match(net_tok, mask_tok, string));
2695 /* match_string - match a string literal */
2697 int match_string(int unused_flags, const char *string, const char *pattern)
2703 /* match_parse_mask - parse net/mask pattern */
2705 static int match_parse_mask(const char *pattern, unsigned long *net_bits,
2706 @@ -198,27 +500,55 @@
2712 /* match_hostaddr - match host by address */
2714 int match_hostaddr(int unused_flags, const char *addr, const char *pattern)
2716 char *myname = "match_hostaddr";
2718 + char *network, *mask, *escl, *escr, *patternx;
2719 + struct in6_addr in6;
2720 + char v4addr[INET_ADDRSTRLEN];
2723 unsigned long mask_bits;
2724 unsigned long net_bits;
2725 unsigned long addr_bits;
2729 msg_info("%s: %s ~? %s", myname, addr, pattern);
2732 + if (addr[strspn(addr, "01234567890./:abcdef")] != 0)
2734 if (addr[strspn(addr, "01234567890./:")] != 0)
2739 + patternx = mystrdup(pattern);
2740 + escl = strchr(patternx,'[');
2741 + escr = strrchr(patternx,']');
2742 + if (escl && escr) {
2744 + sprintf(patternx, "%s%s", escl + 1, escr + 1);
2745 + pattern = patternx;
2750 * Try dictionary lookup. This can be case insensitive. XXX Probably
2751 * should also try again after stripping least significant octets.
2753 - if (strchr(pattern, ':') != 0) {
2755 + if (!(escl && escr) && strchr(pattern, ':') != 0)
2757 + if (strchr(pattern, ':') != 0)
2760 if (dict_lookup(pattern, addr) != 0)
2762 if (dict_errno != 0)
2763 @@ -229,6 +559,12 @@
2765 * Try an exact match with the host address.
2768 + if (inet_pton(AF_INET6, addr, &in6) == 1 && IN6_IS_ADDR_V4MAPPED(&in6)) {
2769 + (void)inet_ntop(AF_INET, &in6.s6_addr[12], v4addr, sizeof(v4addr));
2773 if (strcasecmp(addr, pattern) == 0) {
2776 @@ -237,6 +573,20 @@
2777 * In a net/mask pattern, the mask is specified as the number of bits of
2781 + network = mystrdup(patternx);
2782 + mask = split_at(network, '/');
2784 + if (masked_match(network, mask, (char *)addr)) {
2794 if (match_parse_mask(pattern, &net_bits, &mask_shift)) {
2795 addr_bits = inet_addr(addr);
2796 if (addr_bits == INADDR_NONE)
2798 mask_bits = htonl((0xffffffff) << (BITS_PER_ADDR - mask_shift));
2799 return ((addr_bits & mask_bits) == (net_bits & mask_bits));
2804 diff -Nur postfix-1.1.2.orig/src/util/sys_defs.h postfix-1.1.2/src/util/sys_defs.h
2805 --- postfix-1.1.2.orig/src/util/sys_defs.h Mon Jan 28 12:38:34 2002
2806 +++ postfix-1.1.2/src/util/sys_defs.h Mon Jan 28 12:40:04 2002
2808 #define DEF_MAILBOX_LOCK "flock, dotlock"
2811 +#if ((defined(__NetBSD_Version__) && __NetBSD_Version__ >= 105000000) || defined(USAGI_LIBINET6))
2812 +#define HAVE_GETIFADDRS
2818 diff -Nur postfix-1.1.2.orig/src/util/valid_hostname.c postfix-1.1.2/src/util/valid_hostname.c
2819 --- postfix-1.1.2.orig/src/util/valid_hostname.c Sun Jan 28 15:10:18 2001
2820 +++ postfix-1.1.2/src/util/valid_hostname.c Mon Jan 28 12:40:04 2002
2826 +#include <netinet/in.h>
2827 +#include <sys/socket.h>
2828 +#include <arpa/inet.h>
2832 /* Utility library. */
2835 @@ -103,7 +110,23 @@
2836 msg_warn("%s: misplaced hyphen: %.100s", myname, name);
2842 + else if (ch == ':') {
2843 + struct addrinfo hints, *res;
2845 + memset(&hints, 0, sizeof(hints));
2846 + hints.ai_family = AF_INET6;
2847 + hints.ai_socktype = SOCK_STREAM; /*dummy*/
2848 + hints.ai_flags = AI_NUMERICHOST;
2849 + if (getaddrinfo(name, "0", &hints, &res) == 0) {
2850 + freeaddrinfo(res);
2858 msg_warn("%s: invalid character %d(decimal): %.100s",
2865 + struct addrinfo hints, *res;
2868 #define BYTES_NEEDED 4
2870 @@ -147,6 +173,17 @@
2875 + memset(&hints, 0, sizeof(hints));
2876 + hints.ai_family = AF_INET6;
2877 + hints.ai_socktype = SOCK_STREAM; /*dummy*/
2878 + hints.ai_flags = AI_NUMERICHOST;
2879 + if (getaddrinfo(addr, "0", &hints, &res) == 0) {
2880 + freeaddrinfo(res);
2886 * Scary code to avoid sscanf() overflow nasties.