clean up to compile & work on ARPAVAX; move stat file to

/usr/lib/sendmail.st; fix bug in syserr with error codes

SCCS-vsn: usr.sbin/sendmail/src/conf.c 3.39
SCCS-vsn: usr.sbin/sendmail/src/err.c 3.15
SCCS-vsn: usr.sbin/sendmail/src/version.c 3.61
SCCS-vsn: usr.sbin/sendmail/mailstats/mailstats.c 3.3

diff --git a/usr/src/usr.sbin/sendmail/mailstats/mailstats.c b/usr/src/usr.sbin/sendmail/mailstats/mailstats.c
index 84144fc..79f42b6 100644 (file)
--- a/usr/src/usr.sbin/sendmail/mailstats/mailstats.c
+++ b/usr/src/usr.sbin/sendmail/mailstats/mailstats.c
@@ -1,6 +1,6 @@
 # include "sendmail.h"
 
 # include "sendmail.h"
 

-static char    SccsId[] =      "@(#)mailstats.c        3.2     %G%";
+static char    SccsId[] =      "@(#)mailstats.c        3.3     %G%";

 
 /*
 **  MAILSTATS -- print mail statistics.
 
 /*
 **  MAILSTATS -- print mail statistics.


@@ -17,7 +17,7 @@ main(argc, argv)
 {
        register int fd;
        struct statistics stat;
 {
        register int fd;
        struct statistics stat;

-       char *sfile = "/usr/eric/mailstats";
+       char *sfile = "/usr/lib/sendmail.st";

        register int i;
        extern char *ctime();
 
        register int i;
        extern char *ctime();
 

diff --git a/usr/src/usr.sbin/sendmail/src/conf.c b/usr/src/usr.sbin/sendmail/src/conf.c
index bf92860..12a80a4 100644 (file)
--- a/usr/src/usr.sbin/sendmail/src/conf.c
+++ b/usr/src/usr.sbin/sendmail/src/conf.c
@@ -36,7 +36,7 @@
 
 
 
 
 
 

-static char SccsId[] = "@(#)conf.c     3.38    %G%";
+static char SccsId[] = "@(#)conf.c     3.39    %G%";

 \f/*
 **  Header info table
 **     Final (null) entry contains the flags used for any other field.
 \f/*
 **  Header info table
 **     Final (null) entry contains the flags used for any other field.


@@ -88,7 +88,7 @@ char  Arpa_Usrerr[] = "554";  /* some (fatal) user error */
 
 char   *AliasFile =    "/usr/lib/aliases";     /* alias file */
 char   *ConfFile =     "/usr/lib/sendmail.cf"; /* runtime configuration */
 
 char   *AliasFile =    "/usr/lib/aliases";     /* alias file */
 char   *ConfFile =     "/usr/lib/sendmail.cf"; /* runtime configuration */

-char   *StatFile =     "/usr/lib/mailstats";   /* statistics summary */
+char   *StatFile =     "/usr/lib/sendmail.st"; /* statistics summary */

 char   *HelpFile =     "/usr/lib/sendmail.hf"; /* help file */
 char   *QueueDir =     "/usr/spool/mqueue";    /* queue of saved mail */
 char   *XcriptFile =   "/tmp/mailxXXXXXX";     /* template for transcript */
 char   *HelpFile =     "/usr/lib/sendmail.hf"; /* help file */
 char   *QueueDir =     "/usr/spool/mqueue";    /* queue of saved mail */
 char   *XcriptFile =   "/tmp/mailxXXXXXX";     /* template for transcript */

diff --git a/usr/src/usr.sbin/sendmail/src/err.c b/usr/src/usr.sbin/sendmail/src/err.c
index 7f5a62f..6c671e1 100644 (file)
--- a/usr/src/usr.sbin/sendmail/src/err.c
+++ b/usr/src/usr.sbin/sendmail/src/err.c
@@ -3,7 +3,7 @@
 # include <syslog.h>
 # endif LOG
 
 # include <syslog.h>
 # endif LOG
 

-static char    SccsId[] = "@(#)err.c   3.14    %G%";
+static char    SccsId[] = "@(#)err.c   3.15    %G%";

 
 /*
 **  SYSERR -- Print error message.
 
 /*
 **  SYSERR -- Print error message.


@@ -36,7 +36,7 @@ syserr(fmt, a, b, c, d, e)
        extern char Arpa_Syserr[];
 
        /* format the error message */
        extern char Arpa_Syserr[];
 
        /* format the error message */

-       fmtmsg(errbuf, Arpa_Syserr, NULL, fmt, a, b, c, d, e);
+       fmtmsg(errbuf, NULL, Arpa_Syserr, fmt, a, b, c, d, e);

 
        /* output error message to transcript */
        fprintf(Xscript, "%s\n", errbuf);
 
        /* output error message to transcript */
        fprintf(Xscript, "%s\n", errbuf);

diff --git a/usr/src/usr.sbin/sendmail/src/version.c b/usr/src/usr.sbin/sendmail/src/version.c
index 6ed61f5..7c68007 100644 (file)
--- a/usr/src/usr.sbin/sendmail/src/version.c
+++ b/usr/src/usr.sbin/sendmail/src/version.c
@@ -1,3 +1,3 @@
-static char    SccsId[] = "@(#)SendMail version 3.60 of %G%";
+static char    SccsId[] = "@(#)SendMail version 3.61 of %G%";

 
 

-char   Version[] = "3.60 [%G%]";
+char   Version[] = "3.61 [%G%]";