]> git.ipfire.org Git - thirdparty/postfix.git/commitdiff
postfix-2.2-20041119
authorWietse Venema <wietse@porcupine.org>
Fri, 19 Nov 2004 05:00:00 +0000 (00:00 -0500)
committerViktor Dukhovni <viktor@dukhovni.org>
Tue, 5 Feb 2013 06:30:13 +0000 (06:30 +0000)
postfix/Makefile.in.snapshot [deleted file]
postfix/Makefile.in.stable [deleted file]
postfix/makedefs.snapshot [deleted file]
postfix/makedefs.stable [deleted file]
postfix/src/global/mail_version.h
postfix/src/smtpd/smtpd_check.c

diff --git a/postfix/Makefile.in.snapshot b/postfix/Makefile.in.snapshot
deleted file mode 100644 (file)
index 53aa735..0000000
+++ /dev/null
@@ -1,74 +0,0 @@
-SHELL  = /bin/sh
-WARN    = -Wmissing-prototypes -Wformat
-OPTS   = 'CC=$(CC)'
-DIRS   = src/util src/global src/dns src/master src/postfix src/smtpstone \
-       src/sendmail src/error src/pickup src/cleanup src/smtpd src/local \
-       src/lmtp src/trivial-rewrite src/qmgr src/oqmgr src/smtp src/bounce \
-       src/pipe src/showq src/postalias src/postcat src/postconf src/postdrop \
-       src/postkick src/postlock src/postlog src/postmap src/postqueue \
-       src/postsuper src/qmqpd src/spawn src/flush src/verify \
-       src/virtual src/proxymap src/anvil
-MANDIRS        = proto man html
-
-default: update
-
-makefiles Makefiles:
-       set -e; for i in $(DIRS); do \
-        (set -e; echo "[$$i]"; cd $$i; rm -f Makefile; \
-        $(MAKE) -f Makefile.in Makefile MAKELEVEL=) || exit 1; \
-       done;
-       rm -f Makefile; (set -e; $(SHELL) makedefs && cat Makefile.in) >Makefile
-       (echo "# Do not edit -- this file documents how Postfix was built for your machine."; $(SHELL) makedefs) >makedefs.tmp
-       set +e; if cmp makedefs.tmp conf/makedefs.out; then rm makedefs.tmp; \
-       else mv makedefs.tmp conf/makedefs.out; fi >/dev/null 2>/dev/null
-
-update printfck tests:
-       set -e; for i in $(DIRS); do \
-        (set -e; echo "[$$i]"; cd $$i; $(MAKE) $(OPTS) $@ MAKELEVEL=) || exit 1; \
-       done
-
-manpages:
-       set -e; for i in $(MANDIRS); do \
-        (set -e; echo "[$$i]"; cd $$i; $(MAKE) -f Makefile.in $(OPTS) MAKELEVEL=) || exit 1; \
-       done
-
-printfck: update
-
-install: update
-       $(SHELL) postfix-install
-
-upgrade: update
-       $(SHELL) postfix-install -non-interactive
-
-depend clean:
-       set -e; for i in $(DIRS); do \
-        (set -e; echo "[$$i]"; cd $$i; $(MAKE) $@) || exit 1; \
-       done
-
-depend_update:
-       set -e; for i in $(DIRS); do \
-        (set -e; echo "[$$i]"; cd $$i; $(MAKE) depend && $(MAKE) $(OPTS) update) \
-           || exit 1; \
-       done
-
-tidy:  clean
-       rm -f Makefile */Makefile src/*/Makefile
-       cp Makefile.init Makefile
-       rm -f bin/[!CRS]* lib/[!CRS]* include/[!CRS]* libexec/[!CRS]* \
-           junk */junk */*/junk \
-           *core */*core */*/*core \
-           .nfs* */.nfs* */*/.nfs* \
-           .pure */.pure */*/.pure \
-           *.out */*.out */*/*.out \
-           *.tmp */*.tmp */*/*.tmp \
-           *.a */*.a */*/*.a \
-           *~ */*~ */*/*~ \
-           *- */*- */*/*- \
-           *.orig */*.orig */*/*.orig \
-           *.bak */*.bak */*/*.bak \
-           make.err */make.err */*/make.err \
-           *.gmon */*.gmon */*/*.gmon \
-           conf/main.cf.default
-       find . -type s -print | xargs rm -f
-       find . -type d -print | xargs chmod 755
-       find . -type f -print | xargs chmod a+r
diff --git a/postfix/Makefile.in.stable b/postfix/Makefile.in.stable
deleted file mode 100644 (file)
index ac70d7a..0000000
+++ /dev/null
@@ -1,74 +0,0 @@
-SHELL  = /bin/sh
-WARN    = -Wmissing-prototypes -Wformat
-OPTS   = 'CC=$(CC)'
-DIRS   = src/util src/global src/dns src/master src/postfix src/smtpstone \
-       src/sendmail src/error src/pickup src/cleanup src/smtpd src/local \
-       src/lmtp src/trivial-rewrite src/qmgr src/oqmgr src/smtp src/bounce \
-       src/pipe src/showq src/postalias src/postcat src/postconf src/postdrop \
-       src/postkick src/postlock src/postlog src/postmap src/postqueue \
-       src/postsuper src/qmqpd src/spawn src/flush src/verify \
-       src/virtual src/proxymap
-MANDIRS        = proto man html
-
-default: update
-
-makefiles Makefiles:
-       set -e; for i in $(DIRS); do \
-        (set -e; echo "[$$i]"; cd $$i; rm -f Makefile; \
-        $(MAKE) -f Makefile.in Makefile MAKELEVEL=) || exit 1; \
-       done;
-       rm -f Makefile; (set -e; $(SHELL) makedefs && cat Makefile.in) >Makefile
-       (echo "# Do not edit -- this file documents how Postfix was built for your machine."; $(SHELL) makedefs) >makedefs.tmp
-       set +e; if cmp makedefs.tmp conf/makedefs.out; then rm makedefs.tmp; \
-       else mv makedefs.tmp conf/makedefs.out; fi >/dev/null 2>/dev/null
-
-update printfck tests:
-       set -e; for i in $(DIRS); do \
-        (set -e; echo "[$$i]"; cd $$i; $(MAKE) $(OPTS) $@ MAKELEVEL=) || exit 1; \
-       done
-
-manpages:
-       set -e; for i in $(MANDIRS); do \
-        (set -e; echo "[$$i]"; cd $$i; $(MAKE) -f Makefile.in $(OPTS) MAKELEVEL=) || exit 1; \
-       done
-
-printfck: update
-
-install: update
-       $(SHELL) postfix-install
-
-upgrade: update
-       $(SHELL) postfix-install -non-interactive
-
-depend clean:
-       set -e; for i in $(DIRS); do \
-        (set -e; echo "[$$i]"; cd $$i; $(MAKE) $@) || exit 1; \
-       done
-
-depend_update:
-       set -e; for i in $(DIRS); do \
-        (set -e; echo "[$$i]"; cd $$i; $(MAKE) depend && $(MAKE) $(OPTS) update) \
-           || exit 1; \
-       done
-
-tidy:  clean
-       rm -f Makefile */Makefile src/*/Makefile
-       cp Makefile.init Makefile
-       rm -f bin/[!CRS]* lib/[!CRS]* include/[!CRS]* libexec/[!CRS]* \
-           junk */junk */*/junk \
-           *core */*core */*/*core \
-           .nfs* */.nfs* */*/.nfs* \
-           .pure */.pure */*/.pure \
-           *.out */*.out */*/*.out \
-           *.tmp */*.tmp */*/*.tmp \
-           *.a */*.a */*/*.a \
-           *~ */*~ */*/*~ \
-           *- */*- */*/*- \
-           *.orig */*.orig */*/*.orig \
-           *.bak */*.bak */*/*.bak \
-           make.err */make.err */*/make.err \
-           *.gmon */*.gmon */*/*.gmon \
-           conf/main.cf.default
-       find . -type s -print | xargs rm -f
-       find . -type d -print | xargs chmod 755
-       find . -type f -print | xargs chmod a+r
diff --git a/postfix/makedefs.snapshot b/postfix/makedefs.snapshot
deleted file mode 100644 (file)
index 717686e..0000000
+++ /dev/null
@@ -1,353 +0,0 @@
-#!/bin/sh
-
-#++
-# NAME
-#      makedefs 1
-# SUMMARY
-#      makefile configuration utility
-# SYNOPSIS
-#      \fBmake makefiles \fIname=value...\fR
-# DESCRIPTION
-#      The \fBmakedefs\fR command identifies the program compilation
-#      environment, and emits macro definitions on the standard output
-#      stream that can be prepended to template Makefiles.
-#
-#      Default settings can be overruled by specifying them as
-#      environment variables. Use quotes if variables contain
-#      whitespace or shell meta characters.
-# .IP \fBAUXLIBS=\fIobject_library...\fR
-#      Specifies one or more non-default object libraries.
-# .IP \fBCC=\fIcompiler_command\fR
-#      Specifies a non-default compiler. On many systems, the default
-#      is \fBgcc\fR.
-# .IP \fBCCARGS=\fIcompiler_arguments\fR
-#      Specifies non-default compiler arguments, for example, a non-default
-#      \fIinclude\fR directory.
-# .IP \fBDEBUG=\fIdebug_level\fR
-#      Specifies a non-default debugging level. The default is \fB-g\fR.
-#      Specify \fBDEBUG=\fR to turn off debugging.
-# .IP \fBOPT=\fIoptimization_level\fR
-#      Specifies a non-default optimization level. The default is \fB-O\fR.
-#      Specify \fBOPT=\fR to turn off optimization.
-# .IP \fBWARN=\fIwarning_flags\fR
-#      Specifies non-default gcc compiler warning options for use when
-#      "make" is invoked in a source subdirectory only.
-# LICENSE
-# .ad
-# .fi
-#      The Secure Mailer license must be distributed with this software.
-# AUTHOR(S)
-#      Wietse Venema
-#      IBM T.J. Watson Research
-#      P.O. Box 704
-#      Yorktown Heights, NY 10598, USA
-#--
-
-# Emit system-dependent Makefile macro definitions to standard output.
-
-# Defaults for most sane systems
-
-RANLIB=ranlib
-SYSLIBS=
-AR=ar
-ARFL=rv
-
-SYSTEM=`(uname -s) 2>/dev/null`
-RELEASE=`(uname -r) 2>/dev/null`
-VERSION=`(uname -v) 2>/dev/null`
-
-case "$VERSION" in
- dcosx*) SYSTEM=$VERSION;;
-esac
-
-case "$SYSTEM.$RELEASE" in
-   SCO_SV.3.2) SYSTYPE=SCO5
-               # Use the native compiler by default
-               : ${CC="/usr/bin/cc -b elf"}
-               CCARGS="$CCARGS -DPIPES_CANT_FIONREAD $CCARGS"
-               SYSLIBS="-lsocket -ldbm"
-               RANLIB=echo
-               ;;
-  UnixWare.5*) SYSTYPE=UW7
-               # Use the native compiler by default
-               : ${CC=/usr/bin/cc}
-               RANLIB=echo
-               SYSLIBS="-lresolv -lsocket -lnsl"
-               ;;
-  UNIX_SV.4.2*)        case "`uname -v`" in
-             2.1*) SYSTYPE=UW21
-                   # Use the native compiler by default
-                   : ${CC=/usr/bin/cc}
-                   RANLIB=echo
-                   SYSLIBS="-lresolv -lsocket -lnsl -lc -L/usr/ucblib -lucb"
-                   ;;
-             *) echo "Seems to be UnixWare`uname -v`. Untested." 1>&2; 
-                exit 1;;
-               esac
-               ;;
-  FreeBSD.2*)  SYSTYPE=FREEBSD2
-               ;;
-  FreeBSD.3*)  SYSTYPE=FREEBSD3
-               ;;
-  FreeBSD.4*)  SYSTYPE=FREEBSD4
-               ;;
-  FreeBSD.5*)  SYSTYPE=FREEBSD5
-               ;;
-  OpenBSD.2*)  SYSTYPE=OPENBSD2
-               ;;
-  OpenBSD.3*)  SYSTYPE=OPENBSD3
-               ;;
-  ekkoBSD.1*)  SYSTYPE=EKKOBSD1
-               ;;
-   NetBSD.1*)  SYSTYPE=NETBSD1
-               ;;
-   NetBSD.2*)  SYSTYPE=NETBSD2
-               ;;
-   BSD/OS.2*)  SYSTYPE=BSDI2
-               ;;
-   BSD/OS.3*)  SYSTYPE=BSDI3
-               ;;
-   BSD/OS.4*)  SYSTYPE=BSDI4
-               ;;
- OSF1.V[3-5].*)        SYSTYPE=OSF1
-               # Use the native compiler by default
-               : ${CC=cc}
-               : ${DEBUG="-g3"}
-               ;;
-    SunOS.4*)  SYSTYPE=SUNOS4
-               SYSLIBS=-lresolv
-               ;;
-    SunOS.5*)  SYSTYPE=SUNOS5
-               RANLIB=echo
-               SYSLIBS="-lresolv -lsocket -lnsl"
-               case $RELEASE in
-                   5.[0-4]) CCARGS="$CCARGS -DMISSING_USLEEP";;
-                         *) CCARGS="$CCARGS -DHAS_POSIX_REGEXP";;
-               esac
-               # Work around broken str*casecmp(). Do it all here instead
-               # of having half the solution in the sys_defs.h file.
-               CCARGS="$CCARGS -Dstrcasecmp=fix_strcasecmp \
-                       -Dstrncasecmp=fix_strncasecmp"
-               STRCASE="strcasecmp.o"
-               # Avoid common types of braindamage
-               case "$LD_LIBRARY_PATH" in
-               ?*) echo "Don't set LD_LIBRARY_PATH" 1>&2; exit 1;;
-               esac
-               case "$CC" in
-               *ucb*) echo "Don't use /usr/ucb/cc or ucblib" 1>&2; exit 1;;
-                 cc*) case `which cc` in
-               *ucb*) echo "Don't use /usr/ucb/cc or ucblib" 1>&2; exit 1;;
-                 esac;;
-               esac
-               ;;
-   ULTRIX.4*)  SYSTYPE=ULTRIX4
-               if [ -f /usr/local/lib/libdb.a ]; then
-                   SYSLIBS="$SYSLIBS -ldb"
-                   CCARGS="$CCARGS -DHAS_DB"
-                   if [ -d /usr/local/include/db ]; then
-                       CCARGS="$CCARGS -I/usr/local/include/db"
-                   fi
-               fi
-               for l in syslog resolv; do
-                   if [ -f /usr/local/lib/lib$l.a ]; then
-                       SYSLIBS="$SYSLIBS -l$l"
-                   fi
-               done
-               ;;
-       AIX.*)  case "`uname -v`" in
-               5)      SYSTYPE=AIX4
-                       case "$CC" in
-                       cc|*/cc|xlc|*/xlc) CCARGS="$CCARGS -w -blibpath:/usr/lib:/lib:/usr/local/lib";;
-                       esac
-                       CCARGS="$CCARGS -D_ALL_SOURCE -DHAS_POSIX_REGEXP"
-                       ;;
-               4)      SYSTYPE=AIX4
-                       # How embarrassing...
-                       case "$CC" in
-                       cc|*/cc|xlc|*/xlc) OPT=; CCARGS="$CCARGS -w -blibpath:/usr/lib:/lib:/usr/local/lib";;
-                       esac
-                       CCARGS="$CCARGS -D_ALL_SOURCE -DHAS_POSIX_REGEXP"
-                       ;;
-               3)      SYSTYPE=AIX3
-                       # How embarrassing...
-                       case "$CC" in
-                       cc|*/cc|xlc|*/xlc) OPT=; CCARGS="$CCARGS -w";;
-                       esac
-                       CCARGS="$CCARGS -D_ALL_SOURCE"
-                       ;;
-               *)      echo "Unknown AIX version: `uname -v`." 1>&2; exit 1;;
-               esac;;
-               # Tested with RedHat 3.03 on 20020729.
-    Linux.1*)  SYSTYPE=LINUX1
-               SYSLIBS="-ldb"
-               ;;
-    Linux.2*)  SYSTYPE=LINUX2
-               # Postfix no longer needs DB 1.85 compatibility
-               if [ -f /usr/include/db.h ]
-               then
-                   : we are all set
-               elif [ -f /usr/include/db/db.h ]
-               then
-                   CCARGS="$CCARGS -I/usr/include/db"
-               else
-                   # No, we're not going to try db1 db2 db3 etc.
-                   # On a properly installed system, Postfix builds
-                   # by including <db.h> and by linking with -ldb
-                   echo "No <db.h> include file found." 1>&2
-                   echo "Install the appropriate db*-devel package first." 1>&2
-                   echo "See the RELEASE_NOTES file for more information." 1>&2
-                   exit 1
-               fi
-               # GDBM locks the DBM .pag file after open. This breaks postmap.
-               # if [ -f /usr/include/gdbm-ndbm.h ]
-               # then
-               #     CCARGS="$CCARGS -DHAS_DBM -DPATH_NDBM_H='<gdbm-ndbm.h>'"
-               #     GDBM_LIBS=gdbm
-               # elif [ -f /usr/include/gdbm/ndbm.h ]
-               # then
-               #     CCARGS="$CCARGS -DHAS_DBM -DPATH_NDBM_H='<gdbm/ndbm.h>'"
-               #     GDBM_LIBS=gdbm
-               # fi
-               SYSLIBS="-ldb"
-               for name in nsl resolv $GDBM_LIBS
-               do
-                   for lib in /usr/lib64 /lib64 /usr/lib /lib
-                   do
-                       test -e $lib/lib$name.a -o -e $lib/lib$name.so && {
-                           SYSLIBS="$SYSLIBS -l$name"
-                           break
-                       }
-                   done
-               done
-               ;;
-     IRIX*.5.*)        SYSTYPE=IRIX5
-               # Use the native compiler by default
-               : ${CC=cc} ${DEBUG="-g3"}
-               RANLIB=echo
-               ;;
-     IRIX*.6.*)        SYSTYPE=IRIX6
-               # Use the native compiler by default, and allow nested comments.
-               : ${CC="cc -woff 1009,1116,1412"}
-               RANLIB=echo
-               ;;
-HP-UX.A.09.*)  SYSTYPE=HPUX9
-               SYSLIBS=-ldbm
-               CCARGS="$CCARGS -DMISSING_USLEEP"
-               if [ -f /usr/lib/libdb.a ]; then
-                   CCARGS="$CCARGS -DHAS_DB"
-                   SYSLIBS="$SYSLIBS -ldb"
-               fi
-               ;;
-HP-UX.B.10.*)  SYSTYPE=HPUX10
-               CCARGS="$CCARGS `nm /usr/lib/libc.a 2>/dev/null |
-                   (grep usleep >/dev/null || echo '-DMISSING_USLEEP')`"
-               if [ -f /usr/lib/libdb.a ]; then
-                   CCARGS="$CCARGS -DHAS_DB"
-                   SYSLIBS=-ldb
-               fi
-               ;;
-HP-UX.B.11.*)  SYSTYPE=HPUX11
-               SYSLIBS=-lnsl
-               if [ -f /usr/lib/libdb.a ]; then
-                   CCARGS="$CCARGS -DHAS_DB"
-                   SYSLIBS="$SYSLIBS -ldb"
-               fi
-               ;;
-ReliantUNIX-?.5.43) SYSTYPE=ReliantUnix543
-               RANLIB=echo
-               SYSLIBS="-lresolv -lsocket -lnsl"
-               ;;
-Rhapsody.5*|Darwin.*)
-               SYSTYPE=MACOSX
-               # Use the native compiler by default
-               : ${CC=cc}
-               case $RELEASE in
-                1.[0-3]) AWK=gawk
-                         ;;
-                [2-6].*) AWK=awk
-                         SYSLIBS=-flat_namespace
-                         ;;
-                      *) AWK=awk
-                         SYSLIBS=-flat_namespace
-                         CCARGS="$CCARGS -DBIND_8_COMPAT -DNO_NETINFO"
-                         ;;
-               esac
-               ;;
-"Mac OS".10*)  SYSTYPE=MACOSX
-               # Use the native compiler by default
-               : ${CC=cc}
-               AWK=gawk
-               ;;
-    dcosx.1*)  SYSTYPE=DCOSX1
-               RANLIB=echo
-               SYSLIBS="-lresolv -lsocket -lnsl -lc -lrpcsvc -L/usr/ucblib -lucb"
-               ;;
-
-        ".")   if [ -d /NextApps ]; then
-                   SYSTYPE=`hostinfo | sed -n \
-                       's/^.*NeXT Mach 3.*$/NEXTSTEP3/;/NEXTSTEP3/{p;q;}'`
-                   if [ "$SYSTYPE" = "" ]; then
-                       SYSTYPE=`hostinfo | sed -n \
-                           's/^.*NeXT Mach 4.*$/OPENSTEP4/;/OPENSTEP4/{p;q;}'`
-                   fi
-                   : ${CC=cc}
-                   RANLIB="sleep 5; ranlib"
-               else
-                   echo "Unable to determine your system type." 1>&2; exit 1
-               fi
-               ;;
-          *)   echo "Unknown system type: $SYSTEM $RELEASE" 1>&2; exit 1;;
-esac
-
-#
-# PCRE 3.x has a pcre-config utility so we don't have to guess.
-#
-case "$CCARGS" in
-*-DHAS_PCRE*)  ;;
- *-DNO_PCRE*)  ;;
-           *)  pcre_cflags=`(pcre-config --cflags) 2>/dev/null` &&
-                   pcre_libs=`(pcre-config --libs) 2>/dev/null` && {
-                       CCARGS="$CCARGS -DHAS_PCRE $pcre_cflags"
-                       AUXLIBS="$AUXLIBS $pcre_libs"
-               }
-               ;;
-esac
-
-# Defaults that can be overruled (make makefiles CC=cc OPT=-O6 DEBUG=)
-# Disable optimizations by default when compiling for Purify. Disable
-# optimizations by default with gcc 2.8, until the compiler is known to
-# be OK. Those who dare can still overrule this (make makefiles OPT=-O).
-
-case "$CC" in
- *purify*) : ${OPT=};;
-*/gcc|gcc) case `$CC -v` in
-          "gcc version 2.8"*) : ${OPT=};;
-          esac;;
-      *CC) echo "Don't use CC. That's the C++ compiler" 1>&2; exit 1;;
-        *) : ${OPT='-O'};;
-esac
-
-: ${CC='gcc $(WARN)'} ${OPT='-O'} ${DEBUG='-g'} ${AWK=awk} \
-${WARN='-W -Wformat -Wimplicit -Wmissing-prototypes \
-       -Wparentheses -Wstrict-prototypes -Wswitch -Wuninitialized \
-       -Wunused'}
-
-export SYSTYPE AR ARFL RANLIB SYSLIBS CC OPT DEBUG AWK OPTS
-
-# Snapshot only.
-CCARGS="$CCARGS -DSNAPSHOT"
-
-sed 's/  / /g' <<EOF
-SYSTYPE        = $SYSTYPE
-AR     = $AR
-ARFL   = $ARFL
-RANLIB = $RANLIB
-SYSLIBS        = $AUXLIBS $SYSLIBS
-CC     = $CC $CCARGS
-OPT    = $OPT
-DEBUG  = $DEBUG
-AWK    = $AWK
-STRCASE = $STRCASE
-EXPORT = AUXLIBS='$AUXLIBS' CCARGS='$CCARGS' OPT='$OPT' DEBUG='$DEBUG'
-WARN   = $WARN
-EOF
diff --git a/postfix/makedefs.stable b/postfix/makedefs.stable
deleted file mode 100644 (file)
index 5797191..0000000
+++ /dev/null
@@ -1,350 +0,0 @@
-#!/bin/sh
-
-#++
-# NAME
-#      makedefs 1
-# SUMMARY
-#      makefile configuration utility
-# SYNOPSIS
-#      \fBmake makefiles \fIname=value...\fR
-# DESCRIPTION
-#      The \fBmakedefs\fR command identifies the program compilation
-#      environment, and emits macro definitions on the standard output
-#      stream that can be prepended to template Makefiles.
-#
-#      Default settings can be overruled by specifying them as
-#      environment variables. Use quotes if variables contain
-#      whitespace or shell meta characters.
-# .IP \fBAUXLIBS=\fIobject_library...\fR
-#      Specifies one or more non-default object libraries.
-# .IP \fBCC=\fIcompiler_command\fR
-#      Specifies a non-default compiler. On many systems, the default
-#      is \fBgcc\fR.
-# .IP \fBCCARGS=\fIcompiler_arguments\fR
-#      Specifies non-default compiler arguments, for example, a non-default
-#      \fIinclude\fR directory.
-# .IP \fBDEBUG=\fIdebug_level\fR
-#      Specifies a non-default debugging level. The default is \fB-g\fR.
-#      Specify \fBDEBUG=\fR to turn off debugging.
-# .IP \fBOPT=\fIoptimization_level\fR
-#      Specifies a non-default optimization level. The default is \fB-O\fR.
-#      Specify \fBOPT=\fR to turn off optimization.
-# .IP \fBWARN=\fIwarning_flags\fR
-#      Specifies non-default gcc compiler warning options for use when
-#      "make" is invoked in a source subdirectory only.
-# LICENSE
-# .ad
-# .fi
-#      The Secure Mailer license must be distributed with this software.
-# AUTHOR(S)
-#      Wietse Venema
-#      IBM T.J. Watson Research
-#      P.O. Box 704
-#      Yorktown Heights, NY 10598, USA
-#--
-
-# Emit system-dependent Makefile macro definitions to standard output.
-
-# Defaults for most sane systems
-
-RANLIB=ranlib
-SYSLIBS=
-AR=ar
-ARFL=rv
-
-SYSTEM=`(uname -s) 2>/dev/null`
-RELEASE=`(uname -r) 2>/dev/null`
-VERSION=`(uname -v) 2>/dev/null`
-
-case "$VERSION" in
- dcosx*) SYSTEM=$VERSION;;
-esac
-
-case "$SYSTEM.$RELEASE" in
-   SCO_SV.3.2) SYSTYPE=SCO5
-               # Use the native compiler by default
-               : ${CC="/usr/bin/cc -b elf"}
-               CCARGS="$CCARGS -DPIPES_CANT_FIONREAD $CCARGS"
-               SYSLIBS="-lsocket -ldbm"
-               RANLIB=echo
-               ;;
-  UnixWare.5*) SYSTYPE=UW7
-               # Use the native compiler by default
-               : ${CC=/usr/bin/cc}
-               RANLIB=echo
-               SYSLIBS="-lresolv -lsocket -lnsl"
-               ;;
-  UNIX_SV.4.2*)        case "`uname -v`" in
-             2.1*) SYSTYPE=UW21
-                   # Use the native compiler by default
-                   : ${CC=/usr/bin/cc}
-                   RANLIB=echo
-                   SYSLIBS="-lresolv -lsocket -lnsl -lc -L/usr/ucblib -lucb"
-                   ;;
-             *) echo "Seems to be UnixWare`uname -v`. Untested." 1>&2; 
-                exit 1;;
-               esac
-               ;;
-  FreeBSD.2*)  SYSTYPE=FREEBSD2
-               ;;
-  FreeBSD.3*)  SYSTYPE=FREEBSD3
-               ;;
-  FreeBSD.4*)  SYSTYPE=FREEBSD4
-               ;;
-  FreeBSD.5*)  SYSTYPE=FREEBSD5
-               ;;
-  OpenBSD.2*)  SYSTYPE=OPENBSD2
-               ;;
-  OpenBSD.3*)  SYSTYPE=OPENBSD3
-               ;;
-  ekkoBSD.1*)  SYSTYPE=EKKOBSD1
-               ;;
-   NetBSD.1*)  SYSTYPE=NETBSD1
-               ;;
-   NetBSD.2*)  SYSTYPE=NETBSD2
-               ;;
-   BSD/OS.2*)  SYSTYPE=BSDI2
-               ;;
-   BSD/OS.3*)  SYSTYPE=BSDI3
-               ;;
-   BSD/OS.4*)  SYSTYPE=BSDI4
-               ;;
- OSF1.V[3-5].*)        SYSTYPE=OSF1
-               # Use the native compiler by default
-               : ${CC=cc}
-               : ${DEBUG="-g3"}
-               ;;
-    SunOS.4*)  SYSTYPE=SUNOS4
-               SYSLIBS=-lresolv
-               ;;
-    SunOS.5*)  SYSTYPE=SUNOS5
-               RANLIB=echo
-               SYSLIBS="-lresolv -lsocket -lnsl"
-               case $RELEASE in
-                   5.[0-4]) CCARGS="$CCARGS -DMISSING_USLEEP";;
-                         *) CCARGS="$CCARGS -DHAS_POSIX_REGEXP";;
-               esac
-               # Work around broken str*casecmp(). Do it all here instead
-               # of having half the solution in the sys_defs.h file.
-               CCARGS="$CCARGS -Dstrcasecmp=fix_strcasecmp \
-                       -Dstrncasecmp=fix_strncasecmp"
-               STRCASE="strcasecmp.o"
-               # Avoid common types of braindamage
-               case "$LD_LIBRARY_PATH" in
-               ?*) echo "Don't set LD_LIBRARY_PATH" 1>&2; exit 1;;
-               esac
-               case "$CC" in
-               *ucb*) echo "Don't use /usr/ucb/cc or ucblib" 1>&2; exit 1;;
-                 cc*) case `which cc` in
-               *ucb*) echo "Don't use /usr/ucb/cc or ucblib" 1>&2; exit 1;;
-                 esac;;
-               esac
-               ;;
-   ULTRIX.4*)  SYSTYPE=ULTRIX4
-               if [ -f /usr/local/lib/libdb.a ]; then
-                   SYSLIBS="$SYSLIBS -ldb"
-                   CCARGS="$CCARGS -DHAS_DB"
-                   if [ -d /usr/local/include/db ]; then
-                       CCARGS="$CCARGS -I/usr/local/include/db"
-                   fi
-               fi
-               for l in syslog resolv; do
-                   if [ -f /usr/local/lib/lib$l.a ]; then
-                       SYSLIBS="$SYSLIBS -l$l"
-                   fi
-               done
-               ;;
-       AIX.*)  case "`uname -v`" in
-               5)      SYSTYPE=AIX4
-                       case "$CC" in
-                       cc|*/cc|xlc|*/xlc) CCARGS="$CCARGS -w -blibpath:/usr/lib:/lib:/usr/local/lib";;
-                       esac
-                       CCARGS="$CCARGS -D_ALL_SOURCE -DHAS_POSIX_REGEXP"
-                       ;;
-               4)      SYSTYPE=AIX4
-                       # How embarrassing...
-                       case "$CC" in
-                       cc|*/cc|xlc|*/xlc) OPT=; CCARGS="$CCARGS -w -blibpath:/usr/lib:/lib:/usr/local/lib";;
-                       esac
-                       CCARGS="$CCARGS -D_ALL_SOURCE -DHAS_POSIX_REGEXP"
-                       ;;
-               3)      SYSTYPE=AIX3
-                       # How embarrassing...
-                       case "$CC" in
-                       cc|*/cc|xlc|*/xlc) OPT=; CCARGS="$CCARGS -w";;
-                       esac
-                       CCARGS="$CCARGS -D_ALL_SOURCE"
-                       ;;
-               *)      echo "Unknown AIX version: `uname -v`." 1>&2; exit 1;;
-               esac;;
-               # Tested with RedHat 3.03 on 20020729.
-    Linux.1*)  SYSTYPE=LINUX1
-               SYSLIBS="-ldb"
-               ;;
-    Linux.2*)  SYSTYPE=LINUX2
-               # Postfix no longer needs DB 1.85 compatibility
-               if [ -f /usr/include/db.h ]
-               then
-                   : we are all set
-               elif [ -f /usr/include/db/db.h ]
-               then
-                   CCARGS="$CCARGS -I/usr/include/db"
-               else
-                   # No, we're not going to try db1 db2 db3 etc.
-                   # On a properly installed system, Postfix builds
-                   # by including <db.h> and by linking with -ldb
-                   echo "No <db.h> include file found." 1>&2
-                   echo "Install the appropriate db*-devel package first." 1>&2
-                   echo "See the RELEASE_NOTES file for more information." 1>&2
-                   exit 1
-               fi
-               # GDBM locks the DBM .pag file after open. This breaks postmap.
-               # if [ -f /usr/include/gdbm-ndbm.h ]
-               # then
-               #     CCARGS="$CCARGS -DHAS_DBM -DPATH_NDBM_H='<gdbm-ndbm.h>'"
-               #     GDBM_LIBS=gdbm
-               # elif [ -f /usr/include/gdbm/ndbm.h ]
-               # then
-               #     CCARGS="$CCARGS -DHAS_DBM -DPATH_NDBM_H='<gdbm/ndbm.h>'"
-               #     GDBM_LIBS=gdbm
-               # fi
-               SYSLIBS="-ldb"
-               for name in nsl resolv $GDBM_LIBS
-               do
-                   for lib in /usr/lib64 /lib64 /usr/lib /lib
-                   do
-                       test -e $lib/lib$name.a -o -e $lib/lib$name.so && {
-                           SYSLIBS="$SYSLIBS -l$name"
-                           break
-                       }
-                   done
-               done
-               ;;
-     IRIX*.5.*)        SYSTYPE=IRIX5
-               # Use the native compiler by default
-               : ${CC=cc} ${DEBUG="-g3"}
-               RANLIB=echo
-               ;;
-     IRIX*.6.*)        SYSTYPE=IRIX6
-               # Use the native compiler by default, and allow nested comments.
-               : ${CC="cc -woff 1009,1116,1412"}
-               RANLIB=echo
-               ;;
-HP-UX.A.09.*)  SYSTYPE=HPUX9
-               SYSLIBS=-ldbm
-               CCARGS="$CCARGS -DMISSING_USLEEP"
-               if [ -f /usr/lib/libdb.a ]; then
-                   CCARGS="$CCARGS -DHAS_DB"
-                   SYSLIBS="$SYSLIBS -ldb"
-               fi
-               ;;
-HP-UX.B.10.*)  SYSTYPE=HPUX10
-               CCARGS="$CCARGS `nm /usr/lib/libc.a 2>/dev/null |
-                   (grep usleep >/dev/null || echo '-DMISSING_USLEEP')`"
-               if [ -f /usr/lib/libdb.a ]; then
-                   CCARGS="$CCARGS -DHAS_DB"
-                   SYSLIBS=-ldb
-               fi
-               ;;
-HP-UX.B.11.*)  SYSTYPE=HPUX11
-               SYSLIBS=-lnsl
-               if [ -f /usr/lib/libdb.a ]; then
-                   CCARGS="$CCARGS -DHAS_DB"
-                   SYSLIBS="$SYSLIBS -ldb"
-               fi
-               ;;
-ReliantUNIX-?.5.43) SYSTYPE=ReliantUnix543
-               RANLIB=echo
-               SYSLIBS="-lresolv -lsocket -lnsl"
-               ;;
-Rhapsody.5*|Darwin.*)
-               SYSTYPE=MACOSX
-               # Use the native compiler by default
-               : ${CC=cc}
-               case $RELEASE in
-                1.[0-3]) AWK=gawk
-                         ;;
-                [2-6].*) AWK=awk
-                         SYSLIBS=-flat_namespace
-                         ;;
-                      *) AWK=awk
-                         SYSLIBS=-flat_namespace
-                         CCARGS="$CCARGS -DBIND_8_COMPAT -DNO_NETINFO"
-                         ;;
-               esac
-               ;;
-"Mac OS".10*)  SYSTYPE=MACOSX
-               # Use the native compiler by default
-               : ${CC=cc}
-               AWK=gawk
-               ;;
-    dcosx.1*)  SYSTYPE=DCOSX1
-               RANLIB=echo
-               SYSLIBS="-lresolv -lsocket -lnsl -lc -lrpcsvc -L/usr/ucblib -lucb"
-               ;;
-
-        ".")   if [ -d /NextApps ]; then
-                   SYSTYPE=`hostinfo | sed -n \
-                       's/^.*NeXT Mach 3.*$/NEXTSTEP3/;/NEXTSTEP3/{p;q;}'`
-                   if [ "$SYSTYPE" = "" ]; then
-                       SYSTYPE=`hostinfo | sed -n \
-                           's/^.*NeXT Mach 4.*$/OPENSTEP4/;/OPENSTEP4/{p;q;}'`
-                   fi
-                   : ${CC=cc}
-                   RANLIB="sleep 5; ranlib"
-               else
-                   echo "Unable to determine your system type." 1>&2; exit 1
-               fi
-               ;;
-          *)   echo "Unknown system type: $SYSTEM $RELEASE" 1>&2; exit 1;;
-esac
-
-#
-# PCRE 3.x has a pcre-config utility so we don't have to guess.
-#
-case "$CCARGS" in
-*-DHAS_PCRE*)  ;;
- *-DNO_PCRE*)  ;;
-           *)  pcre_cflags=`(pcre-config --cflags) 2>/dev/null` &&
-                   pcre_libs=`(pcre-config --libs) 2>/dev/null` && {
-                       CCARGS="$CCARGS -DHAS_PCRE $pcre_cflags"
-                       AUXLIBS="$AUXLIBS $pcre_libs"
-               }
-               ;;
-esac
-
-# Defaults that can be overruled (make makefiles CC=cc OPT=-O6 DEBUG=)
-# Disable optimizations by default when compiling for Purify. Disable
-# optimizations by default with gcc 2.8, until the compiler is known to
-# be OK. Those who dare can still overrule this (make makefiles OPT=-O).
-
-case "$CC" in
- *purify*) : ${OPT=};;
-*/gcc|gcc) case `$CC -v` in
-          "gcc version 2.8"*) : ${OPT=};;
-          esac;;
-      *CC) echo "Don't use CC. That's the C++ compiler" 1>&2; exit 1;;
-        *) : ${OPT='-O'};;
-esac
-
-: ${CC='gcc $(WARN)'} ${OPT='-O'} ${DEBUG='-g'} ${AWK=awk} \
-${WARN='-W -Wformat -Wimplicit -Wmissing-prototypes \
-       -Wparentheses -Wstrict-prototypes -Wswitch -Wuninitialized \
-       -Wunused'}
-
-export SYSTYPE AR ARFL RANLIB SYSLIBS CC OPT DEBUG AWK OPTS
-
-sed 's/  / /g' <<EOF
-SYSTYPE        = $SYSTYPE
-AR     = $AR
-ARFL   = $ARFL
-RANLIB = $RANLIB
-SYSLIBS        = $AUXLIBS $SYSLIBS
-CC     = $CC $CCARGS
-OPT    = $OPT
-DEBUG  = $DEBUG
-AWK    = $AWK
-STRCASE = $STRCASE
-EXPORT = AUXLIBS='$AUXLIBS' CCARGS='$CCARGS' OPT='$OPT' DEBUG='$DEBUG'
-WARN   = $WARN
-EOF
index 1aaa9489417f5d09f0c5dc019522b8773fbb2ba6..b79e8a2ac62e01153dcd0107fca263cfdd44a844 100644 (file)
@@ -20,7 +20,7 @@
   * Patches change the patchlevel and the release date. Snapshots change the
   * release date only.
   */
-#define MAIL_RELEASE_DATE      "20041118"
+#define MAIL_RELEASE_DATE      "20041119"
 #define MAIL_VERSION_NUMBER    "2.2"
 
 #define VAR_MAIL_VERSION       "mail_version"
index 5966ebceec153f0bd497726f427e6664b2752b2e..dca4fa5aa3f6f51cdb0f06e39bea9d91fa174d47 100644 (file)
@@ -3423,8 +3423,8 @@ void    smtpd_check_rewrite(SMTPD_STATE *state)
        if (strcasecmp(name, PERMIT_MYNETWORKS) == 0) {
            status = permit_mynetworks(state);
        } else if (is_map_command(state, name, CHECK_ADDR_MAP, &cpp)) {
-           if ((dict = dict_handle(name)) == 0)
-               msg_panic("%s: dictionary not found: %s", myname, name);
+           if ((dict = dict_handle(*cpp)) == 0)
+               msg_panic("%s: dictionary not found: %s", myname, *cpp);
            if (dict_get(dict, state->addr) != 0)
                status = SMTPD_CHECK_OK;
        } else if (strcasecmp(name, PERMIT_SASL_AUTH) == 0) {