diff -u -r zmailer-2.99.48p5/Makefile.in zmailer-2.99.48p6/Makefile.in
--- zmailer-2.99.48p5/Makefile.in       Tue Jun 17 17:18:32 1997
+++ zmailer-2.99.48p6/Makefile.in       Sat Jun 21 18:33:13 1997
@@ -2,7 +2,7 @@

MAJORVERSION = 2
MINORVERSION = 99
-PATCHLEVEL =   48p5
+PATCHLEVEL =   48p6

srcdir = @srcdir@
VPATH = @srcdir@
diff -u -r zmailer-2.99.48p5/configure.in zmailer-2.99.48p6/configure.in
--- zmailer-2.99.48p5/configure.in      Thu Jun 19 10:25:55 1997
+++ zmailer-2.99.48p6/configure.in      Sun Jun 22 03:29:51 1997
@@ -1060,11 +1060,8 @@
    ac_cv_func_char_sprintf=yes,
    ac_cv_func_char_sprintf=no)])
AC_MSG_RESULT([$ac_cv_func_char_sprintf])
-AC_SUBST(DSPRINTF_TYPE)
if test $ac_cv_func_char_sprintf = yes; then
-  DSPRINTF_TYPE="-DSPRINTF_CHAR"
-else
-  DSPRINTF_TYPE=""
+  AC_DEFINE(SPRINTF_CHAR)
fi
])

diff -u -r zmailer-2.99.48p5/include/hostenv.h zmailer-2.99.48p6/include/hostenv.h
--- zmailer-2.99.48p5/include/hostenv.h Fri Oct 25 12:18:24 1996
+++ zmailer-2.99.48p6/include/hostenv.h Sun Jun 22 01:58:19 1997
@@ -9,6 +9,10 @@
# define FCNTL_H <fcntl.h>
#endif

+#ifdef HAVE_STRING_H
+#include <string.h>
+#endif
+
#ifdef __GNUC__
# define alloca __builtin_alloca
# define USE_ALLOCA 1
diff -u -r zmailer-2.99.48p5/include/identuser.h zmailer-2.99.48p6/include/identuser.h
--- zmailer-2.99.48p5/include/identuser.h       Wed Feb 19 02:22:41 1997
+++ zmailer-2.99.48p6/include/identuser.h       Sat Jun 21 19:42:05 1997
@@ -9,7 +9,7 @@
# endif
#endif

-extern unsigned short ident_tcpport;
+extern int ident_tcpport;
extern int ident_fd2 __((int fd, struct in_addr *inlocal, struct in_addr *inremote, unsigned short *local, unsigned short *remote));
extern int ident_tcpsock __((struct in_addr *inlocal, struct in_addr *inremote));
extern char *ident_sockuser2 __((/*int s, unsigned short local, unsigned short remote, char *buf, int buflen*/));
diff -u -r zmailer-2.99.48p5/libc/getaddrinfo.c zmailer-2.99.48p6/libc/getaddrinfo.c
--- zmailer-2.99.48p5/libc/getaddrinfo.c        Tue Jun 10 20:35:25 1997
+++ zmailer-2.99.48p6/libc/getaddrinfo.c        Sun Jun 22 01:58:48 1997
@@ -54,6 +54,8 @@
#include <arpa/nameser.h>
#include <resolv.h>

+extern int h_errno;
+
#ifndef AF_LOCAL
#define AF_LOCAL AF_UNIX
#endif /* AF_LOCAL */
diff -u -r zmailer-2.99.48p5/libc/getnameinfo.c zmailer-2.99.48p6/libc/getnameinfo.c
--- zmailer-2.99.48p5/libc/getnameinfo.c        Tue Jun 10 20:39:18 1997
+++ zmailer-2.99.48p6/libc/getnameinfo.c        Sun Jun 22 01:59:12 1997
@@ -50,6 +50,8 @@
#include <arpa/nameser.h>
#include <resolv.h>

+extern int h_errno;
+
#ifndef AF_LOCAL
#define AF_LOCAL AF_UNIX
#endif /* AF_LOCAL */
diff -u -r zmailer-2.99.48p5/libident/identuser.c zmailer-2.99.48p6/libident/identuser.c
--- zmailer-2.99.48p5/libident/identuser.c      Sun May 11 15:53:45 1997
+++ zmailer-2.99.48p6/libident/identuser.c      Sat Jun 21 19:42:52 1997
@@ -52,7 +52,7 @@
#define FNDELAY O_NDELAY
#endif

-unsigned int ident_tcpport = 113;
+int ident_tcpport = 113;

#define SIZ 500 /* various buffers */

diff -u -r zmailer-2.99.48p5/libident/identuser.h zmailer-2.99.48p6/libident/identuser.h
--- zmailer-2.99.48p5/libident/identuser.h      Mon Jul  8 10:08:23 1996
+++ zmailer-2.99.48p6/libident/identuser.h      Sat Jun 21 19:42:12 1997
@@ -9,14 +9,19 @@
# endif
#endif

-extern unsigned short ident_tcpport;
-extern char *ident_xline();
-extern int ident_fd __((int fd, struct in_addr *in, unsigned short *local, unsigned short *remote));
+extern int ident_tcpport;
extern int ident_fd2 __((int fd, struct in_addr *inlocal, struct in_addr *inremote, unsigned short *local, unsigned short *remote));
extern int ident_tcpsock __((struct in_addr *inlocal, struct in_addr *inremote));
+extern char *ident_sockuser2 __((/*int s, unsigned short local, unsigned short remote, char *buf, int buflen*/));
+extern char *ident_tcpuser4 __((/* struct in_addr *inlocal, struct in_addr *inremote, unsigned short local, unsigned short remote, int timeout, char *buf, int buflen */));
+extern char *ident_tcpuser9 __((/* int af, int alen, void *inlocal, void *inremote, unsigned short local, unsigned short remote, int timeout, char *buf, int buflen */));
+
+#if 0
+extern char *ident_xline();
+extern int ident_fd __((int fd, struct in_addr *in, unsigned short *local, unsigned short *remote));
/* extern char *ident_tcpuser(); */
extern char *ident_tcpuser2 __((/*struct in_addr *inlocal, struct in_addr *inremote, unsigned short local, unsigned short remote*/));
extern char *ident_tcpuser3 __((/*struct in_addr *inlocal, struct in_addr *inremote, unsigned short local, unsigned short remote, int timeout*/));
extern char *ident_sockuser __((/*int s, unsigned short local, unsigned short remote*/));
-
+#endif
#endif
diff -u -r zmailer-2.99.48p5/smtpserver/smtpcmds.c zmailer-2.99.48p6/smtpserver/smtpcmds.c
--- zmailer-2.99.48p5/smtpserver/smtpcmds.c     Mon Apr 28 11:44:16 1997
+++ zmailer-2.99.48p6/smtpserver/smtpcmds.c     Sun Jun 22 02:51:09 1997
@@ -564,9 +564,6 @@
       /*printf("  <path>: len=%d \"%s\"\n",cp-s,cp);*/

       if (*cp == '\0') {
-#if 0
-         SS->mfp->_flags |= _IO_ERR_SEEN; /* test at Linux libc 5.x */
-#endif
         type(SS,501, "5.1.3", "what is a null recipient?");
         return;
       }
diff -u -r zmailer-2.99.48p5/support/vacation/vacation.c zmailer-2.99.48p6/support/vacation/vacation.c
--- zmailer-2.99.48p5/support/vacation/vacation.c       Sat Apr  5 02:32:56 1997
+++ zmailer-2.99.48p6/support/vacation/vacation.c       Sat Jun 21 20:54:35 1997
@@ -686,17 +686,3 @@
       fprintf(stderr,"vacation: [-i] [-d] [-a alias] [-m msgfile] [-r interval] login\n");
       exit(EX_USAGE);
}
-
-#ifndef HAVE_STRERROR
-
-extern int sys_nerr;
-extern char *sys_errlist[];
-
-char *
-strerror(errno)
-int errno;
-{
-       if (errno < 1 || errno > sys_nerr) return "Unknown errno!";
-       return sys_errlist[errno];
-}
-#endif
diff -u -r zmailer-2.99.48p5/transports/libta/diagnostic.c zmailer-2.99.48p6/transports/libta/diagnostic.c
--- zmailer-2.99.48p5/transports/libta/diagnostic.c     Tue Jun 17 16:14:28 1997
+++ zmailer-2.99.48p6/transports/libta/diagnostic.c     Sun Jun 22 21:57:29 1997
@@ -295,19 +295,16 @@
#endif

         /* Log the diagnostic string to the file */
-         len = -1;
-/* #ifndef SPRINTF_CHAR
-   len =
-   #endif */
-         sprintf(sbuf, "%c%c%ld:%ld:%ld::%ld\t%s\t%s\n",
-                 _CF_DIAGNOSTIC, _CFTAG_NORMAL,
-                 rp->id, rp->headeroffset, rp->drptoffset,
+#ifndef SPRINTF_CHAR
+         len =
+#endif
+           sprintf(sbuf, "%c%c%ld:%ld:%ld::%ld\t%s\t%s\n",
+                   _CF_DIAGNOSTIC, _CFTAG_NORMAL,
+                   rp->id, rp->headeroffset, rp->drptoffset,
                 time(NULL), notarybuf ? notarybuf : "", message);
-/* #ifdef SPRINTF_CHAR */
-/* If the autoconfig fails, we are in DEEP trouble,
-   and the 'len' variable in uninitialized.. */
+#ifdef SPRINTF_CHAR
         len = strlen(sbuf);
-/* #endif */
+#endif
         oldalarm = alarm(0);  /* We do NOT want to be alarmed while
                                  writing to the log! */

diff -u -r zmailer-2.99.48p5/configure zmailer-2.99.48p6/configure
--- zmailer-2.99.48p5/configure Thu Jun 19 12:14:37 1997
+++ zmailer-2.99.48p6/configure Sun Jun 22 21:20:09 1997
@@ -6115,11 +6115,11 @@
fi

echo "$ac_t""$ac_cv_func_char_sprintf" 1>&6
-
if test $ac_cv_func_char_sprintf = yes; then
-  DSPRINTF_TYPE="-DSPRINTF_CHAR"
-else
-  DSPRINTF_TYPE=""
+  cat >> confdefs.h <<\EOF
+#define SPRINTF_CHAR 1
+EOF
+
fi

echo $ac_n "checking for vprintf""... $ac_c" 1>&6
@@ -8299,7 +8299,6 @@
s%@LIBWRAP@%$LIBWRAP%g
s%@INCLWRAP@%$INCLWRAP%g
s%@LIBLOADAVER@%$LIBLOADAVER%g
-s%@DSPRINTF_TYPE@%$DSPRINTF_TYPE%g
s%@ALLOCA@%$ALLOCA%g

CEOF

You are viewing proxied material from ftp.icm.edu.pl. The copyright of proxied material belongs to its original authors. Any comments or complaints in relation to proxied material should be directed to the original authors of the content concerned. Please see the disclaimer for more details.