lint it

SCCS-vsn: usr.sbin/sendmail/src/main.c 3.140
SCCS-vsn: usr.sbin/sendmail/src/alias.c 3.41
SCCS-vsn: usr.sbin/sendmail/src/deliver.c 3.132
SCCS-vsn: usr.sbin/sendmail/src/err.c 3.35
SCCS-vsn: usr.sbin/sendmail/src/clock.c 3.12
SCCS-vsn: usr.sbin/sendmail/src/parseaddr.c 3.66
SCCS-vsn: usr.sbin/sendmail/src/savemail.c 3.49
SCCS-vsn: usr.sbin/sendmail/src/version.c 3.252
SCCS-vsn: usr.sbin/sendmail/src/queue.c 3.53
SCCS-vsn: usr.sbin/sendmail/src/srvrsmtp.c 3.38
SCCS-vsn: usr.sbin/sendmail/src/readcf.c 3.47
SCCS-vsn: usr.sbin/sendmail/src/headers.c 3.39

diff --git a/usr/src/usr.sbin/sendmail/src/alias.c b/usr/src/usr.sbin/sendmail/src/alias.c
index a5a0499..75bc406 100644 (file)
--- a/usr/src/usr.sbin/sendmail/src/alias.c
+++ b/usr/src/usr.sbin/sendmail/src/alias.c
@@ -5,9 +5,9 @@
 # include "sendmail.h"
 
 # ifdef DBM
 # include "sendmail.h"
 
 # ifdef DBM

-SCCSID(@(#)alias.c     3.40            %G%     (with DBM));
+SCCSID(@(#)alias.c     3.41            %G%     (with DBM));

 # else DBM
 # else DBM

-SCCSID(@(#)alias.c     3.40            %G%     (without DBM));
+SCCSID(@(#)alias.c     3.41            %G%     (without DBM));

 # endif DBM
 
 /*
 # endif DBM
 
 /*


@@ -267,33 +267,6 @@ initaliases(aliasfile, init)
 # endif DBM
 }
 \f/*
 # endif DBM
 }
 \f/*

-**  DBMCLOSE -- close the dbm file.
-**
-**     This is highly implementation dependent.  It should be in the
-**     DBM library rather than here.  So why isn't it?
-**
-**     This is really only needed to save file descriptors.  It can be
-**     safely (??) replaced by the null routine.
-**
-**     Parameters:
-**             none.
-**
-**     Returns:
-**             none.
-**
-**     Side Effects:
-**             Closes the DBM file.
-*/
-
-dbmclose()
-{
-       /* hack attack!! -- see comment above */
-       extern int pagf, dirf;
-
-       (void) close(pagf);
-       (void) close(dirf);
-}
-\f/*

 **  READALIASES -- read and process the alias file.
 **
 **     This routine implements the part of initaliases that occurs
 **  READALIASES -- read and process the alias file.
 **
 **     This routine implements the part of initaliases that occurs

diff --git a/usr/src/usr.sbin/sendmail/src/clock.c b/usr/src/usr.sbin/sendmail/src/clock.c
index 192e9bc..a9f4429 100644 (file)
--- a/usr/src/usr.sbin/sendmail/src/clock.c
+++ b/usr/src/usr.sbin/sendmail/src/clock.c
@@ -1,6 +1,6 @@
 # include "sendmail.h"
 
 # include "sendmail.h"
 

-SCCSID(@(#)clock.c     3.11            %G%);
+SCCSID(@(#)clock.c     3.12            %G%);

 
 /*
 **  SETEVENT -- set an event to happen at a specific time.
 
 /*
 **  SETEVENT -- set an event to happen at a specific time.


@@ -32,7 +32,7 @@ setevent(intvl, func, arg)
        if (intvl <= 0)
        {
                syserr("setevent: intvl=%ld\n", intvl);
        if (intvl <= 0)
        {
                syserr("setevent: intvl=%ld\n", intvl);

-               return;
+               return (NULL);

        }
 # endif DEBUG
 
        }
 # endif DEBUG
 


@@ -100,7 +100,7 @@ clrevent(ev)
        if (*evp != NULL)
        {
                *evp = ev->ev_link;
        if (*evp != NULL)
        {
                *evp = ev->ev_link;

-               free(ev);
+               free((char *) ev);

        }
 
        /* restore clocks and pick up anything spare */
        }
 
        /* restore clocks and pick up anything spare */


@@ -151,7 +151,7 @@ tick()
                /* we must be careful in here because ev_func may not return */
                f = ev->ev_func;
                a = ev->ev_arg;
                /* we must be careful in here because ev_func may not return */
                f = ev->ev_func;
                a = ev->ev_arg;

-               free(ev);
+               free((char *) ev);

                if (ev->ev_pid != getpid())
                        continue;
                if (EventQueue != NULL)
                if (ev->ev_pid != getpid())
                        continue;
                if (EventQueue != NULL)


@@ -195,7 +195,7 @@ sleep(intvl)
        if (intvl == 0)
                return;
        SleepDone = FALSE;
        if (intvl == 0)
                return;
        SleepDone = FALSE;

-       setevent(intvl, endsleep, 0);
+       (void) setevent(intvl, endsleep, 0);

        while (!SleepDone)
                pause();
 }
        while (!SleepDone)
                pause();
 }

diff --git a/usr/src/usr.sbin/sendmail/src/deliver.c b/usr/src/usr.sbin/sendmail/src/deliver.c
index 0d3d5fc..5d15ed8 100644 (file)
--- a/usr/src/usr.sbin/sendmail/src/deliver.c
+++ b/usr/src/usr.sbin/sendmail/src/deliver.c
@@ -3,7 +3,7 @@
 # include "sendmail.h"
 # include <sys/stat.h>
 
 # include "sendmail.h"
 # include <sys/stat.h>
 

-SCCSID(@(#)deliver.c   3.131           %G%);
+SCCSID(@(#)deliver.c   3.132           %G%);

 
 /*
 **  DELIVER -- Deliver a message to a list of addresses.
 
 /*
 **  DELIVER -- Deliver a message to a list of addresses.


@@ -992,9 +992,7 @@ putheader(fp, m, e)
        register HDR *h;
        extern char *arpadate();
        extern char *capitalize();
        register HDR *h;
        extern char *arpadate();
        extern char *capitalize();

-       extern bool samefrom();

        char obuf[MAXLINE];
        char obuf[MAXLINE];

-       register char *obp;

        bool fullsmtp = bitset(M_FULLSMTP, m->m_flags);
 
        if (bitset(M_LOCAL, m->m_flags) && fullsmtp)
        bool fullsmtp = bitset(M_FULLSMTP, m->m_flags);
 
        if (bitset(M_LOCAL, m->m_flags) && fullsmtp)


@@ -1260,60 +1258,6 @@ isatword(p)
        return (FALSE);
 }
 \f/*
        return (FALSE);
 }
 \f/*

-**  SAMEFROM -- tell if two text addresses represent the same from address.
-**
-**     Parameters:
-**             ifrom -- internally generated form of from address.
-**             efrom -- external form of from address.
-**
-**     Returns:
-**             TRUE -- if they convey the same info.
-**             FALSE -- if any information has been lost.
-**
-**     Side Effects:
-**             none.
-*/
-
-bool
-samefrom(ifrom, efrom)
-       char *ifrom;
-       char *efrom;
-{
-       register char *p;
-       char buf[MAXNAME + 4];
-
-# ifdef DEBUG
-       if (tTd(3, 8))
-               printf("samefrom(%s,%s)-->", ifrom, efrom);
-# endif DEBUG
-       if (strcmp(ifrom, efrom) == 0)
-               goto success;
-       p = index(ifrom, '@');
-       if (p == NULL)
-               goto failure;
-       *p = '\0';
-       (void) strcpy(buf, ifrom);
-       (void) strcat(buf, " at ");
-       *p++ = '@';
-       (void) strcat(buf, p);
-       if (strcmp(buf, efrom) == 0)
-               goto success;
-
-  failure:
-# ifdef DEBUG
-       if (tTd(3, 8))
-               printf("FALSE\n");
-# endif DEBUG
-       return (FALSE);
-
-  success:
-# ifdef DEBUG
-       if (tTd(3, 8))
-               printf("TRUE\n");
-# endif DEBUG
-       return (TRUE);
-}
-\f/*

 **  MAILFILE -- Send a message to a file.
 **
 **     If the file has the setuid/setgid bits set, but NO execute
 **  MAILFILE -- Send a message to a file.
 **
 **     If the file has the setuid/setgid bits set, but NO execute


@@ -1608,8 +1552,6 @@ sendall(e, mode)
 checkerrors(e)
        register ENVELOPE *e;
 {
 checkerrors(e)
        register ENVELOPE *e;
 {

-       register ADDRESS *q;
-

 # ifdef DEBUG
        if (tTd(4, 1))
        {
 # ifdef DEBUG
        if (tTd(4, 1))
        {

diff --git a/usr/src/usr.sbin/sendmail/src/err.c b/usr/src/usr.sbin/sendmail/src/err.c
index 91a011c..2686460 100644 (file)
--- a/usr/src/usr.sbin/sendmail/src/err.c
+++ b/usr/src/usr.sbin/sendmail/src/err.c
@@ -1,6 +1,6 @@
 # include "sendmail.h"
 
 # include "sendmail.h"
 

-SCCSID(@(#)err.c       3.34            %G%);
+SCCSID(@(#)err.c       3.35            %G%);

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


@@ -142,7 +142,7 @@ nmessage(num, msg, a, b, c, d, e)
        register char *msg;
 {
        errno = 0;
        register char *msg;
 {
        errno = 0;

-       fmtmsg(MsgBuf, NULL, num, msg, a, b, c, d, e);
+       fmtmsg(MsgBuf, (char *) NULL, num, msg, a, b, c, d, e);

        putmsg(MsgBuf, FALSE);
 }
 \f/*
        putmsg(MsgBuf, FALSE);
 }
 \f/*

diff --git a/usr/src/usr.sbin/sendmail/src/headers.c b/usr/src/usr.sbin/sendmail/src/headers.c
index ab49560..5e82f59 100644 (file)
--- a/usr/src/usr.sbin/sendmail/src/headers.c
+++ b/usr/src/usr.sbin/sendmail/src/headers.c
@@ -1,7 +1,7 @@
 # include <errno.h>
 # include "sendmail.h"
 
 # include <errno.h>
 # include "sendmail.h"
 

-SCCSID(@(#)headers.c   3.38            %G%);
+SCCSID(@(#)headers.c   3.39            %G%);

 
 /*
 **  CHOMPHEADER -- process and save a header line.
 
 /*
 **  CHOMPHEADER -- process and save a header line.


@@ -112,7 +112,7 @@ chompheader(line, def)
        if (cond)
                h->h_flags |= H_CHECK;
        if (h->h_value != NULL)
        if (cond)
                h->h_flags |= H_CHECK;
        if (h->h_value != NULL)

-               free(h->h_value);
+               free((char *) h->h_value);

                (void) sendto(h->h_value, 0, (ADDRESS *) NULL, 0);
 
        /* hack to see if this is a new format message */
                (void) sendto(h->h_value, 0, (ADDRESS *) NULL, 0);
 
        /* hack to see if this is a new format message */


@@ -212,35 +212,6 @@ hvalue(field)
        return (NULL);
 }
 \f/*
        return (NULL);
 }
 \f/*

-**  HRVALUE -- return pointer to header descriptor.
-**
-**     Like hvalue except returns header descriptor block and isn't
-**     picky about "real" headers.
-**
-**     Parameters:
-**             field -- name of field we are interested in.
-**
-**     Returns:
-**             pointer to header descriptor.
-**
-**     Side Effects:
-**             none.
-*/
-
-HDR *
-hrvalue(field)
-       char *field;
-{
-       register HDR *h;
-
-       for (h = CurEnv->e_header; h != NULL; h = h->h_link)
-       {
-               if (strcmp(h->h_field, field) == 0)
-                       return (h);
-       }
-       return (NULL);
-}
-\f/*

 **  ISHEADER -- predicate telling if argument is a header.
 **
 **     A line is a header if it has a single word followed by
 **  ISHEADER -- predicate telling if argument is a header.
 **
 **     A line is a header if it has a single word followed by


@@ -270,72 +241,6 @@ isheader(s)
        return (*s == ':');
 }
 \f/*
        return (*s == ':');
 }
 \f/*

-**  GETXPART -- extract the "signature" part of an address line.
-**
-**     Try to extract the full name from a general address
-**     field.  We take anything which is a comment as a
-**     first choice.  Failing in that, we see if there is
-**     a "machine readable" name (in <angle brackets>); if
-**     so we take anything preceeding that clause.
-**
-**     If we blow it here it's not all that serious.
-**
-**     Parameters:
-**             p -- line to crack.
-**
-**     Returns:
-**             signature part.
-**             NULL if no signature part.
-**
-**     Side Effects:
-**             none.
-*/
-
-char *
-getxpart(p)
-       register char *p;
-{
-       register char *q;
-       register char *rval = NULL;
-
-       q = index(p, '(');
-       if (q != NULL)
-       {
-               int parenlev = 0;
-
-               for (p = q; *p != '\0'; p++)
-               {
-                       if (*p == '(')
-                               parenlev++;
-                       else if (*p == ')' && --parenlev <= 0)
-                               break;
-               }
-               if (*p == ')')
-               {
-                       *p = '\0';
-                       if (*++q != '\0')
-                               rval = newstr(q);
-                       *p = ')';
-               }
-       }
-       else if ((q = index(p, '<')) != NULL)
-       {
-               char savec;
-
-               while (*--q == ' ')
-                       continue;
-               while (isspace(*p))
-                       p++;
-               savec = *++q;
-               *q = '\0';
-               if (*p != '\0')
-                       rval = newstr(p);
-               *q = savec;
-       }
-
-       return (rval);
-}
-\f/*

 **  EATHEADER -- run through the stored header and extract info.
 **
 **     Parameters:
 **  EATHEADER -- run through the stored header and extract info.
 **
 **     Parameters:


@@ -353,7 +258,6 @@ eatheader()
 {
        register HDR *h;
        register char *p;
 {
        register HDR *h;
        register char *p;

-       char buf[MAXLINE];

 
 # ifdef DEBUG
        if (tTd(32, 2))
 
 # ifdef DEBUG
        if (tTd(32, 2))

diff --git a/usr/src/usr.sbin/sendmail/src/main.c b/usr/src/usr.sbin/sendmail/src/main.c
index 7851eb7..09a2180 100644 (file)
--- a/usr/src/usr.sbin/sendmail/src/main.c
+++ b/usr/src/usr.sbin/sendmail/src/main.c
@@ -6,7 +6,7 @@
 # include "sendmail.h"
 # include <sys/stat.h>
 
 # include "sendmail.h"
 # include <sys/stat.h>
 

-SCCSID(@(#)main.c      3.139           %G%);
+SCCSID(@(#)main.c      3.140           %G%);

 
 /*
 **  SENDMAIL -- Post mail to a set of destinations.
 
 /*
 **  SENDMAIL -- Post mail to a set of destinations.


@@ -455,7 +455,6 @@ main(argc, argv)
                        register char **pvp;
                        char *q;
                        extern char **prescan();
                        register char **pvp;
                        char *q;
                        extern char **prescan();

-                       extern char **rewrite();

                        extern char *DelimChar;
 
                        printf("> ");
                        extern char *DelimChar;
 
                        printf("> ");


@@ -1153,7 +1152,7 @@ newenvelope(e)
        register HDR **nhp;
 
        clear((char *) e, sizeof *e);
        register HDR **nhp;
 
        clear((char *) e, sizeof *e);

-       bmove(&CurEnv->e_from, &e->e_from, sizeof e->e_from);
+       bmove((char *) &CurEnv->e_from, (char *) &e->e_from, sizeof e->e_from);

        e->e_parent = CurEnv;
        e->e_ctime = curtime();
        e->e_puthdr = CurEnv->e_puthdr;
        e->e_parent = CurEnv;
        e->e_ctime = curtime();
        e->e_puthdr = CurEnv->e_puthdr;


@@ -1421,8 +1420,8 @@ freeze(freezefile)
        strcpy(fhdr.frzver, Version);
 
        /* write out the freeze header */
        strcpy(fhdr.frzver, Version);
 
        /* write out the freeze header */

-       if (write(f, &fhdr, sizeof fhdr) != sizeof fhdr ||
-           write(f, &edata, fhdr.frzbrk - &edata) != (fhdr.frzbrk - &edata))
+       if (write(f, (char *) &fhdr, sizeof fhdr) != sizeof fhdr ||
+           write(f, (char *) &edata, fhdr.frzbrk - &edata) != (fhdr.frzbrk - &edata))

                syserr("Cannot freeze");
 
        /* fine, clean up */
                syserr("Cannot freeze");
 
        /* fine, clean up */


@@ -1461,7 +1460,7 @@ thaw(freezefile)
        }
 
        /* read in the header */
        }
 
        /* read in the header */

-       if (read(f, &fhdr, sizeof fhdr) < sizeof fhdr ||
+       if (read(f, (char *) &fhdr, sizeof fhdr) < sizeof fhdr ||

            strcmp(fhdr.frzver, Version) != 0)
        {
                (void) close(f);
            strcmp(fhdr.frzver, Version) != 0)
        {
                (void) close(f);


@@ -1477,7 +1476,7 @@ thaw(freezefile)
        }
 
        /* now read in the freeze file */
        }
 
        /* now read in the freeze file */

-       if (read(f, &edata, fhdr.frzbrk - &edata) != (fhdr.frzbrk - &edata))
+       if (read(f, (char *) &edata, fhdr.frzbrk - &edata) != (fhdr.frzbrk - &edata))

        {
                /* oops!  we have trashed memory..... */
                fprintf(stderr, "Cannot read freeze file\n");
        {
                /* oops!  we have trashed memory..... */
                fprintf(stderr, "Cannot read freeze file\n");

diff --git a/usr/src/usr.sbin/sendmail/src/parseaddr.c b/usr/src/usr.sbin/sendmail/src/parseaddr.c
index cc717ad..c4b9d08 100644 (file)
--- a/usr/src/usr.sbin/sendmail/src/parseaddr.c
+++ b/usr/src/usr.sbin/sendmail/src/parseaddr.c
@@ -1,6 +1,6 @@
 # include "sendmail.h"
 
 # include "sendmail.h"
 

-SCCSID(@(#)parseaddr.c 3.65            %G%);
+SCCSID(@(#)parseaddr.c 3.66            %G%);

 
 /*
 **  PARSE -- Parse an address
 
 /*
 **  PARSE -- Parse an address


@@ -50,7 +50,6 @@ parse(addr, a, copyf)
        register struct mailer *m;
        extern char **prescan();
        extern ADDRESS *buildaddr();
        register struct mailer *m;
        extern char **prescan();
        extern ADDRESS *buildaddr();

-       static char nbuf[MAXNAME];

 
        /*
        **  Initialize and prescan address.
 
        /*
        **  Initialize and prescan address.


@@ -211,7 +210,7 @@ prescan(addr, delim)
 {
        register char *p;
        register char *q;
 {
        register char *p;
        register char *q;

-       register char c;
+       register int c;

        char **avp;
        bool bslashmode;
        int cmntcnt;
        char **avp;
        bool bslashmode;
        int cmntcnt;

diff --git a/usr/src/usr.sbin/sendmail/src/queue.c b/usr/src/usr.sbin/sendmail/src/queue.c
index 377b975..dc3d996 100644 (file)
--- a/usr/src/usr.sbin/sendmail/src/queue.c
+++ b/usr/src/usr.sbin/sendmail/src/queue.c
@@ -5,10 +5,10 @@
 # include <errno.h>
 
 # ifndef QUEUE
 # include <errno.h>
 
 # ifndef QUEUE

-SCCSID(@(#)queue.c     3.52            %G%     (no queueing));
+SCCSID(@(#)queue.c     3.53            %G%     (no queueing));

 # else QUEUE
 
 # else QUEUE
 

-SCCSID(@(#)queue.c     3.52            %G%);
+SCCSID(@(#)queue.c     3.53            %G%);

 
 /*
 **  QUEUEUP -- queue a message up for future transmission.
 
 /*
 **  QUEUEUP -- queue a message up for future transmission.


@@ -39,7 +39,6 @@ queueup(e, queueall)
        register FILE *tfp;
        register HDR *h;
        register ADDRESS *q;
        register FILE *tfp;
        register HDR *h;
        register ADDRESS *q;

-       register int i;

 
        /*
        **  Create control file.
 
        /*
        **  Create control file.


@@ -131,8 +130,10 @@ queueup(e, queueall)
                        fprintf(tfp, "%s: %s\n", h->h_field, buf);
                }
                else if (bitset(H_FROM|H_RCPT, h->h_flags))
                        fprintf(tfp, "%s: %s\n", h->h_field, buf);
                }
                else if (bitset(H_FROM|H_RCPT, h->h_flags))

-                       commaize(h, h->h_value, tfp,
-                                bitset(EF_OLDSTYLE, e->e_flags), NULL);
+               {
+                       commaize(h, h->h_value, tfp, bitset(EF_OLDSTYLE, e->e_flags),
+                                (MAILER *) NULL);
+               }

                else
                        fprintf(tfp, "%s: %s\n", h->h_field, h->h_value);
        }
                else
                        fprintf(tfp, "%s: %s\n", h->h_field, h->h_value);
        }


@@ -195,7 +196,7 @@ runqueue(forkflag)
                                i = wait(&stat);
                        } while (i >= 0 && i != pid);
                        if (QueueIntvl != 0)
                                i = wait(&stat);
                        } while (i >= 0 && i != pid);
                        if (QueueIntvl != 0)

-                               setevent(QueueIntvl, runqueue, TRUE);
+                               (void) setevent(QueueIntvl, runqueue, TRUE);

                        return;
                }
                /* child -- double fork */
                        return;
                }
                /* child -- double fork */


@@ -425,8 +426,6 @@ dowork(w)
 
        if (i == 0)
        {
 
        if (i == 0)
        {

-               char buf[MAXNAME];
-

                /*
                **  CHILD
                **      Lock the control file to avoid duplicate deliveries.
                /*
                **  CHILD
                **      Lock the control file to avoid duplicate deliveries.


@@ -449,7 +448,7 @@ dowork(w)
 
                /* don't use the headers from sendmail.cf... */
                CurEnv->e_header = NULL;
 
                /* don't use the headers from sendmail.cf... */
                CurEnv->e_header = NULL;

-               chompheader("from: $q", TRUE);
+               (void) chompheader("from: $q", TRUE);

 
                /* create the link to the control file during processing */
                if (link(w->w_name, queuename(CurEnv, 'l')) < 0)
 
                /* create the link to the control file during processing */
                if (link(w->w_name, queuename(CurEnv, 'l')) < 0)


@@ -522,8 +521,7 @@ readqf(cf)
 {
        register FILE *f;
        char buf[MAXFIELD];
 {
        register FILE *f;
        char buf[MAXFIELD];

-       register char *p;
-       register int i;
+       extern char *fgetfolded();

        extern ADDRESS *sendto();
 
        /*
        extern ADDRESS *sendto();
 
        /*

diff --git a/usr/src/usr.sbin/sendmail/src/readcf.c b/usr/src/usr.sbin/sendmail/src/readcf.c
index d053b5c..4d43928 100644 (file)
--- a/usr/src/usr.sbin/sendmail/src/readcf.c
+++ b/usr/src/usr.sbin/sendmail/src/readcf.c
@@ -1,6 +1,6 @@
 # include "sendmail.h"
 
 # include "sendmail.h"
 

-SCCSID(@(#)readcf.c    3.46            %G%);
+SCCSID(@(#)readcf.c    3.47            %G%);

 
 /*
 **  READCF -- read control file.
 
 /*
 **  READCF -- read control file.


@@ -54,12 +54,13 @@ readcf(cfname, safe)
        int ruleset = 0;
        char *q;
        char **pv;
        int ruleset = 0;
        char *q;
        char **pv;

+       struct rewrite *rwp = NULL;

        char buf[MAXLINE];
        register char *p;
        char buf[MAXLINE];
        register char *p;

-       struct rewrite *rwp = NULL;

        extern char **prescan();
        extern char **copyplist();
        char exbuf[MAXLINE];
        extern char **prescan();
        extern char **copyplist();
        char exbuf[MAXLINE];

+       extern char *fgetfolded();

 
        cf = fopen(cfname, "r");
        if (cf == NULL)
 
        cf = fopen(cfname, "r");
        if (cf == NULL)

diff --git a/usr/src/usr.sbin/sendmail/src/savemail.c b/usr/src/usr.sbin/sendmail/src/savemail.c
index 08a5274..4b3fc6b 100644 (file)
--- a/usr/src/usr.sbin/sendmail/src/savemail.c
+++ b/usr/src/usr.sbin/sendmail/src/savemail.c
@@ -1,7 +1,7 @@
 # include <pwd.h>
 # include "sendmail.h"
 
 # include <pwd.h>
 # include "sendmail.h"
 

-SCCSID(@(#)savemail.c  3.48            %G%);
+SCCSID(@(#)savemail.c  3.49            %G%);

 
 /*
 **  SAVEMAIL -- Save mail on error
 
 /*
 **  SAVEMAIL -- Save mail on error


@@ -242,7 +242,7 @@ returntosender(msg, returnto, sendbody)
        ee = newenvelope(&errenvelope);
        ee->e_puthdr = putheader;
        ee->e_putbody = errbody;
        ee = newenvelope(&errenvelope);
        ee->e_puthdr = putheader;
        ee->e_putbody = errbody;

-       queuename(ee, '\0');
+       (void) queuename(ee, '\0');

        addheader("to", returnto->q_paddr, ee);
        addheader("subject", msg, ee);
 
        addheader("to", returnto->q_paddr, ee);
        addheader("subject", msg, ee);
 

diff --git a/usr/src/usr.sbin/sendmail/src/srvrsmtp.c b/usr/src/usr.sbin/sendmail/src/srvrsmtp.c
index 8be42dd..06b93b2 100644 (file)
--- a/usr/src/usr.sbin/sendmail/src/srvrsmtp.c
+++ b/usr/src/usr.sbin/sendmail/src/srvrsmtp.c
@@ -2,10 +2,10 @@
 # include "sendmail.h"
 
 # ifndef SMTP
 # include "sendmail.h"
 
 # ifndef SMTP

-SCCSID(@(#)srvrsmtp.c  3.37            %G%     (no SMTP));
+SCCSID(@(#)srvrsmtp.c  3.38            %G%     (no SMTP));

 # else SMTP
 
 # else SMTP
 

-SCCSID(@(#)srvrsmtp.c  3.37            %G%);
+SCCSID(@(#)srvrsmtp.c  3.38            %G%);

 
 /*
 **  SMTP -- run the SMTP protocol.
 
 /*
 **  SMTP -- run the SMTP protocol.


@@ -101,7 +101,7 @@ smtp()
                (void) dup(fileno(OutChannel));
        }
        message("220", "%s Sendmail %s ready at %s", HostName,
                (void) dup(fileno(OutChannel));
        }
        message("220", "%s Sendmail %s ready at %s", HostName,

-                       Version, arpadate(NULL));
+                       Version, arpadate((char *) NULL));

        (void) setjmp(TopFrame);
        QuickAbort = FALSE;
        for (;;)
        (void) setjmp(TopFrame);
        QuickAbort = FALSE;
        for (;;)


@@ -154,8 +154,6 @@ smtp()
                        break;
 
                  case CMDMAIL:         /* mail -- designate sender */
                        break;
 
                  case CMDMAIL:         /* mail -- designate sender */

-                       firsttime = FALSE;
-

                        /* check for validity of this command */
                        if (hasmail)
                        {
                        /* check for validity of this command */
                        if (hasmail)
                        {

diff --git a/usr/src/usr.sbin/sendmail/src/version.c b/usr/src/usr.sbin/sendmail/src/version.c
index 5aea835..0925375 100644 (file)
--- a/usr/src/usr.sbin/sendmail/src/version.c
+++ b/usr/src/usr.sbin/sendmail/src/version.c
@@ -1,5 +1,5 @@
 # ifndef lint
 # ifndef lint

-static char    SccsId[] = "@(#)SendMail version 3.251 of %G%";
+static char    SccsId[] = "@(#)SendMail version 3.252 of %G%";

 # endif lint
 
 # endif lint
 

-char   Version[] = "3.251 [%G%]";
+char   Version[] = "3.252 [%G%]";