[src/trunk]: src/gnu/dist/postfix resolve conflicts

[perry <perry%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/0cfd79ea4760
branches:  trunk
changeset: 521668:0cfd79ea4760
user:      perry <perry%NetBSD.org@localhost>
date:      Sun Feb 03 03:27:17 2002 +0000

description:
resolve conflicts

diffstat:

 gnu/dist/postfix/conf/main.cf               |  11 ++++-------
 gnu/dist/postfix/makedefs                   |   3 +--
 gnu/dist/postfix/src/global/resolve_local.c |   2 +-
 gnu/dist/postfix/src/master/master.h        |   4 ++--
 4 files changed, 8 insertions(+), 12 deletions(-)

diffs (76 lines):

diff -r 4d369ff531f9 -r 0cfd79ea4760 gnu/dist/postfix/conf/main.cf
--- a/gnu/dist/postfix/conf/main.cf     Sun Feb 03 03:10:53 2002 +0000
+++ b/gnu/dist/postfix/conf/main.cf     Sun Feb 03 03:27:17 2002 +0000
@@ -238,15 +238,12 @@
 # 
 #local_recipient_maps = $alias_maps unix:passwd.byname
 
-# If you use both the Postfix local and virtual delivery agents, specify:
-#
-#local_recipient_maps = $alias_maps unix:passwd.byname $virtual_mailbox_maps
-
 # INPUT RATE CONTROL
 #
 # The in_flow_delay configuration parameter implements mail input
-# flow control. This feature is turned off by default because it
-# needs further development.
+# flow control. This feature is turned on by default, although it
+# still needs further development (it's disabled on SCO UNIX due
+# to an SCO bug).
 # 
 # A Postfix process will pause for $in_flow_delay seconds before
 # accepting a new message, when the message arrival rate exceeds the
@@ -256,7 +253,7 @@
 # 
 # Specify 0 to disable the feature. Valid delays are 0..10.
 # 
-#in_flow_delay = 1
+#in_flow_delay = 1s
 
 # ADDRESS REWRITING
 #
diff -r 4d369ff531f9 -r 0cfd79ea4760 gnu/dist/postfix/makedefs
--- a/gnu/dist/postfix/makedefs Sun Feb 03 03:10:53 2002 +0000
+++ b/gnu/dist/postfix/makedefs Sun Feb 03 03:27:17 2002 +0000
@@ -61,14 +61,13 @@
    SCO_SV.3.2) SYSTYPE=SCO5
                # Use the native compiler by default
                : ${CC="/usr/bin/cc -b elf"}
-               : ${DEBUG=}
+               CCARGS="-DPIPES_CANT_FIONREAD $CCARGS"
                SYSLIBS="-lsocket -ldbm"
                RANLIB=echo
                ;;
   UnixWare.5*) SYSTYPE=UW7
                # Use the native compiler by default
                : ${CC=/usr/bin/cc}
-               : ${DEBUG=}
                RANLIB=echo
                SYSLIBS="-lresolv -lsocket -lnsl"
                ;;
diff -r 4d369ff531f9 -r 0cfd79ea4760 gnu/dist/postfix/src/global/resolve_local.c
--- a/gnu/dist/postfix/src/global/resolve_local.c       Sun Feb 03 03:10:53 2002 +0000
+++ b/gnu/dist/postfix/src/global/resolve_local.c       Sun Feb 03 03:27:17 2002 +0000
@@ -92,7 +92,7 @@
      */
     len = strlen(saved_addr);
     if (len == 0)
-       msg_panic("resolve_local: null domain");
+       RETURN(0);
     if (saved_addr[len - 1] == '.')
        saved_addr[--len] = 0;
 
diff -r 4d369ff531f9 -r 0cfd79ea4760 gnu/dist/postfix/src/master/master.h
--- a/gnu/dist/postfix/src/master/master.h      Sun Feb 03 03:10:53 2002 +0000
+++ b/gnu/dist/postfix/src/master/master.h      Sun Feb 03 03:27:17 2002 +0000
@@ -165,8 +165,8 @@
  /*
   * master_flow.c
   */
-void    master_flow_init(void);
-int     master_flow_pipe[2];
+extern void master_flow_init(void);
+extern int master_flow_pipe[2];
 
 /* DIAGNOSTICS
 /* BUGS