Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/gnu/dist/postfix Resolve conflicts
details: https://anonhg.NetBSD.org/src/rev/66be01733b72
branches: trunk
changeset: 571178:66be01733b72
user: heas <heas%NetBSD.org@localhost>
date: Sat Nov 13 05:45:10 2004 +0000
description:
Resolve conflicts
diffstat:
gnu/dist/postfix/man/man5/postconf.5 | 16 +++++-------
gnu/dist/postfix/src/dns/dns_lookup.c | 6 ++--
gnu/dist/postfix/src/smtp/smtp_addr.c | 41 ++++++++++++++++---------------
gnu/dist/postfix/src/smtpd/smtpd.c | 8 +++--
gnu/dist/postfix/src/smtpd/smtpd_check.c | 4 +-
gnu/dist/postfix/src/util/sys_defs.h | 12 ++++++++-
6 files changed, 49 insertions(+), 38 deletions(-)
diffs (223 lines):
diff -r 32006cf216e2 -r 66be01733b72 gnu/dist/postfix/man/man5/postconf.5
--- a/gnu/dist/postfix/man/man5/postconf.5 Sat Nov 13 05:05:16 2004 +0000
+++ b/gnu/dist/postfix/man/man5/postconf.5 Sat Nov 13 05:45:10 2004 +0000
@@ -1,4 +1,4 @@
-.\" $NetBSD: postconf.5,v 1.2 2004/09/04 23:33:07 lukem Exp $
+.\" $NetBSD: postconf.5,v 1.3 2004/11/13 05:45:10 heas Exp $
.\"
.TH POSTCONF 5
.SH NAME
@@ -2527,10 +2527,10 @@
address extension.
.IP \(bu
Look up the "user+extension" address local part when the
-recipient domain equals $myorigin, $mydestination, $inet_interfaces
+sender domain equals $myorigin, $mydestination, $inet_interfaces
or $proxy_interfaces.
.IP \(bu
-Look up the "user" address local part when the recipient domain
+Look up the "user" address local part when the sender domain
equals $myorigin, $mydestination, $inet_interfaces or $proxy_interfaces.
.IP \(bu
Look up the "@domain.tld" part.
@@ -3549,9 +3549,8 @@
or $proxy_interfaces, but the recipient is not listed in
$local_recipient_maps, and $local_recipient_maps is not null.
.IP \(bu
-The recipient domain matches $virtual_alias_maps but the
-recipient is not listed in $virtual_alias_maps, and $virtual_alias_maps
-is not null.
+The recipient domain matches $virtual_alias_domains but the
+recipient is not listed in $virtual_alias_maps.
.IP \(bu
The recipient domain matches $virtual_mailbox_domains but the
recipient is not listed in $virtual_mailbox_maps, and $virtual_mailbox_maps
@@ -3572,9 +3571,8 @@
$proxy_interfaces, but the recipient is not listed in
$local_recipient_maps, and $local_recipient_maps is not null.
.IP \(bu
-The sender domain matches $virtual_alias_maps but the recipient
-is not listed in $virtual_alias_maps, and $virtual_alias_maps is
-not null.
+The sender domain matches $virtual_alias_domains but the recipient
+is not listed in $virtual_alias_maps.
.IP \(bu
The sender domain matches $virtual_mailbox_domains but the
recipient is not listed in $virtual_mailbox_maps, and $virtual_mailbox_maps
diff -r 32006cf216e2 -r 66be01733b72 gnu/dist/postfix/src/dns/dns_lookup.c
--- a/gnu/dist/postfix/src/dns/dns_lookup.c Sat Nov 13 05:05:16 2004 +0000
+++ b/gnu/dist/postfix/src/dns/dns_lookup.c Sat Nov 13 05:45:10 2004 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: dns_lookup.c,v 1.8 2004/05/31 00:46:47 heas Exp $ */
+/* $NetBSD: dns_lookup.c,v 1.9 2004/11/13 05:45:33 heas Exp $ */
/*++
/* NAME
@@ -514,7 +514,7 @@
vstring_sprintf(why,
"Name service error for %s: invalid host or domain name",
name);
- h_errno = HOST_NOT_FOUND;
+ SET_H_ERRNO(HOST_NOT_FOUND);
return (DNS_NOTFOUND);
}
@@ -526,7 +526,7 @@
vstring_sprintf(why,
"Name service error for %s: invalid host or domain name",
name);
- h_errno = HOST_NOT_FOUND;
+ SET_H_ERRNO(HOST_NOT_FOUND);
return (DNS_NOTFOUND);
}
diff -r 32006cf216e2 -r 66be01733b72 gnu/dist/postfix/src/smtp/smtp_addr.c
--- a/gnu/dist/postfix/src/smtp/smtp_addr.c Sat Nov 13 05:05:16 2004 +0000
+++ b/gnu/dist/postfix/src/smtp/smtp_addr.c Sat Nov 13 05:45:10 2004 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: smtp_addr.c,v 1.8 2004/05/31 00:46:48 heas Exp $ */
+/* $NetBSD: smtp_addr.c,v 1.9 2004/11/13 05:45:33 heas Exp $ */
/*++
/* NAME
@@ -264,40 +264,41 @@
{
char *myname = "smtp_find_self";
INET_ADDR_LIST *self;
+ INET_ADDR_LIST *proxy;
DNS_RR *addr;
int i;
- /*
- * Find the first address that lists any address that this mail system is
- * supposed to be listening on.
- */
#define INADDRP(x) ((struct in_addr *) (x))
self = own_inet_addr_list();
+ proxy = proxy_inet_addr_list();
+
for (addr = addr_list; addr; addr = addr->next) {
+
+ /*
+ * Find out if this mail system is listening on this address.
+ */
for (i = 0; i < self->used; i++)
if (INADDRP(addr->data)->s_addr == self->addrs[i].s_addr) {
if (msg_verbose)
- msg_info("%s: found at pref %d", myname, addr->pref);
+ msg_info("%s: found self at pref %d", myname, addr->pref);
+ return (addr);
+ }
+
+ /*
+ * Find out if this mail system has a proxy listening on this
+ * address.
+ */
+ for (i = 0; i < proxy->used; i++)
+ if (INADDRP(addr->data)->s_addr == proxy->addrs[i].s_addr) {
+ if (msg_verbose)
+ msg_info("%s: found proxy at pref %d", myname, addr->pref);
return (addr);
}
}
/*
- * Find out if this mail system has a proxy listening on this address.
- */
- self = proxy_inet_addr_list();
- for (addr = addr_list; addr; addr = addr->next) {
- for (i = 0; i < self->used; i++)
- if (INADDRP(addr->data)->s_addr == self->addrs[i].s_addr) {
- if (msg_verbose)
- msg_info("%s: found at pref %d", myname, addr->pref);
- return (addr);
- }
- }
-
- /*
- * Didn't find myself.
+ * Didn't find myself, or my proxy.
*/
if (msg_verbose)
msg_info("%s: not found", myname);
diff -r 32006cf216e2 -r 66be01733b72 gnu/dist/postfix/src/smtpd/smtpd.c
--- a/gnu/dist/postfix/src/smtpd/smtpd.c Sat Nov 13 05:05:16 2004 +0000
+++ b/gnu/dist/postfix/src/smtpd/smtpd.c Sat Nov 13 05:45:10 2004 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: smtpd.c,v 1.11 2004/07/28 23:19:42 heas Exp $ */
+/* $NetBSD: smtpd.c,v 1.12 2004/11/13 05:45:33 heas Exp $ */
/*++
/* NAME
@@ -2395,8 +2395,9 @@
case SMTP_ERR_TIME:
state->reason = "timeout";
- smtpd_chat_reply(state, "421 %s Error: timeout exceeded",
- var_myhostname);
+ if (vstream_setjmp(state->client) == 0)
+ smtpd_chat_reply(state, "421 %s Error: timeout exceeded",
+ var_myhostname);
break;
case SMTP_ERR_EOF:
@@ -2439,6 +2440,7 @@
&& var_smtpd_delay_reject == 0
&& (state->access_denied = smtpd_check_client(state)) != 0) {
smtpd_chat_reply(state, "%s", state->access_denied);
+ state->error_count++;
} else {
smtpd_chat_reply(state, "220 %s", var_smtpd_banner);
}
diff -r 32006cf216e2 -r 66be01733b72 gnu/dist/postfix/src/smtpd/smtpd_check.c
--- a/gnu/dist/postfix/src/smtpd/smtpd_check.c Sat Nov 13 05:05:16 2004 +0000
+++ b/gnu/dist/postfix/src/smtpd/smtpd_check.c Sat Nov 13 05:45:10 2004 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: smtpd_check.c,v 1.15 2004/05/31 00:46:48 heas Exp $ */
+/* $NetBSD: smtpd_check.c,v 1.16 2004/11/13 05:45:33 heas Exp $ */
/*++
/* NAME
@@ -2185,7 +2185,7 @@
FULL, &found, reply_name, reply_class,
def_acl)) != 0 || found)
CHECK_SERVER_RETURN(status);
- h_errno = 0; /* XXX */
+ SET_H_ERRNO(0); /* XXX */
if ((hp = gethostbyname((char *) server->data)) == 0) {
msg_warn("Unable to look up %s host %s for %s %s: %s",
dns_strtype(type), (char *) server->data,
diff -r 32006cf216e2 -r 66be01733b72 gnu/dist/postfix/src/util/sys_defs.h
--- a/gnu/dist/postfix/src/util/sys_defs.h Sat Nov 13 05:05:16 2004 +0000
+++ b/gnu/dist/postfix/src/util/sys_defs.h Sat Nov 13 05:45:10 2004 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: sys_defs.h,v 1.14 2004/07/28 23:19:42 heas Exp $ */
+/* $NetBSD: sys_defs.h,v 1.15 2004/11/13 05:45:33 heas Exp $ */
#ifndef _SYS_DEFS_H_INCLUDED_
#define _SYS_DEFS_H_INCLUDED_
@@ -340,6 +340,8 @@
#define USE_STATVFS
#define STATVFS_IN_SYS_STATVFS_H
#define UNIX_DOMAIN_CONNECT_BLOCKS_FOR_ACCEPT
+#define STRCASECMP_IN_STRINGS_H
+#define SET_H_ERRNO(err) (set_h_errno(err))
#endif
#ifdef UW21 /* UnixWare 2.1.x */
@@ -1161,6 +1163,14 @@
#endif
/*
+ * Setting globals like h_errno can be problematic when Postfix is linked
+ * with multi-threaded libraries.
+ */
+#ifndef SET_H_ERRNO
+#define SET_H_ERRNO(err) (h_errno = (err))
+#endif
+
+ /*
* Making the ctype.h macros not more expensive than necessary. On some
* systems, ctype.h misbehaves with non-ASCII and/or negative characters.
*/
Home |
Main Index |
Thread Index |
Old Index