prototype functions

SCCS-vsn: usr.sbin/sendmail/src/usersmtp.c 6.32
SCCS-vsn: usr.sbin/sendmail/src/headers.c 6.35
SCCS-vsn: usr.sbin/sendmail/src/recipient.c 6.41
SCCS-vsn: usr.sbin/sendmail/src/macro.c 6.8
SCCS-vsn: usr.sbin/sendmail/src/main.c 6.67
SCCS-vsn: usr.sbin/sendmail/src/envelope.c 6.35
SCCS-vsn: usr.sbin/sendmail/src/parseaddr.c 6.57
SCCS-vsn: usr.sbin/sendmail/src/collect.c 6.17
SCCS-vsn: usr.sbin/sendmail/src/sendmail.h 6.67
SCCS-vsn: usr.sbin/sendmail/src/savemail.c 6.44
SCCS-vsn: usr.sbin/sendmail/src/daemon.c 6.52
SCCS-vsn: usr.sbin/sendmail/src/srvrsmtp.c 6.56
SCCS-vsn: usr.sbin/sendmail/src/util.c 6.19
SCCS-vsn: usr.sbin/sendmail/src/readcf.c 6.40
SCCS-vsn: usr.sbin/sendmail/src/deliver.c 6.79
SCCS-vsn: usr.sbin/sendmail/src/queue.c 6.58
SCCS-vsn: usr.sbin/sendmail/src/alias.c 6.49
SCCS-vsn: usr.sbin/sendmail/src/udb.c 6.21

diff --git a/usr/src/usr.sbin/sendmail/src/alias.c b/usr/src/usr.sbin/sendmail/src/alias.c
index 704f7cf..f87d755 100644 (file)
--- a/usr/src/usr.sbin/sendmail/src/alias.c
+++ b/usr/src/usr.sbin/sendmail/src/alias.c
@@ -11,7 +11,7 @@
 # include <pwd.h>
 
 #ifndef lint
 # include <pwd.h>
 
 #ifndef lint

-static char sccsid[] = "@(#)alias.c    6.48 (Berkeley) %G%";
+static char sccsid[] = "@(#)alias.c    6.49 (Berkeley) %G%";

 #endif /* not lint */
 
 
 #endif /* not lint */
 
 


@@ -417,8 +417,6 @@ rebuildaliases(map, automatic)
 #ifdef LOG
        if (LogLevel > 7)
        {
 #ifdef LOG
        if (LogLevel > 7)
        {

-               extern char *username();
-

                syslog(LOG_NOTICE, "alias database %s %srebuilt by %s",
                        map->map_file, automatic ? "auto" : "", username());
        }
                syslog(LOG_NOTICE, "alias database %s %srebuilt by %s",
                        map->map_file, automatic ? "auto" : "", username());
        }

diff --git a/usr/src/usr.sbin/sendmail/src/collect.c b/usr/src/usr.sbin/sendmail/src/collect.c
index 53f7e2e..e3f0065 100644 (file)
--- a/usr/src/usr.sbin/sendmail/src/collect.c
+++ b/usr/src/usr.sbin/sendmail/src/collect.c
@@ -7,7 +7,7 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)collect.c  6.16 (Berkeley) %G%";
+static char sccsid[] = "@(#)collect.c  6.17 (Berkeley) %G%";

 #endif /* not lint */
 
 # include <errno.h>
 #endif /* not lint */
 
 # include <errno.h>


@@ -332,7 +332,6 @@ flusheol(buf, fp)
        register char *p = buf;
        bool printmsg = TRUE;
        char junkbuf[MAXLINE];
        register char *p = buf;
        bool printmsg = TRUE;
        char junkbuf[MAXLINE];

-       extern char *sfgets();

 
        while (strchr(p, '\n') == NULL)
        {
 
        while (strchr(p, '\n') == NULL)
        {

diff --git a/usr/src/usr.sbin/sendmail/src/daemon.c b/usr/src/usr.sbin/sendmail/src/daemon.c
index 89ebe5f..cff01e2 100644 (file)
--- a/usr/src/usr.sbin/sendmail/src/daemon.c
+++ b/usr/src/usr.sbin/sendmail/src/daemon.c
@@ -13,9 +13,9 @@
 
 #ifndef lint
 #ifdef DAEMON
 
 #ifndef lint
 #ifdef DAEMON

-static char sccsid[] = "@(#)daemon.c   6.51 (Berkeley) %G% (with daemon mode)";
+static char sccsid[] = "@(#)daemon.c   6.52 (Berkeley) %G% (with daemon mode)";

 #else
 #else

-static char sccsid[] = "@(#)daemon.c   6.51 (Berkeley) %G% (without daemon mode)";
+static char sccsid[] = "@(#)daemon.c   6.52 (Berkeley) %G% (without daemon mode)";

 #endif
 #endif /* not lint */
 
 #endif
 #endif /* not lint */
 


@@ -60,8 +60,6 @@ static char sccsid[] = "@(#)daemon.c  6.51 (Berkeley) %G% (without daemon mode)";
 **             Convert the entry in hbuf into a canonical form.
 */
 
 **             Convert the entry in hbuf into a canonical form.
 */
 

-extern char    *anynet_ntoa();
-

 static FILE    *MailPort;      /* port that mail comes in on */
 \f/*
 **  GETREQUESTS -- open mail IPC port and get requests.
 static FILE    *MailPort;      /* port that mail comes in on */
 \f/*
 **  GETREQUESTS -- open mail IPC port and get requests.


@@ -713,7 +711,6 @@ host_map_lookup(map, name, av, statp)
        char hbuf[MAXNAME];
        extern struct hostent *gethostbyaddr();
        extern int h_errno;
        char hbuf[MAXNAME];
        extern struct hostent *gethostbyaddr();
        extern int h_errno;

-       extern char *map_rewrite();

 
        /*
        **  See if we have already looked up this name.  If so, just
 
        /*
        **  See if we have already looked up this name.  If so, just

diff --git a/usr/src/usr.sbin/sendmail/src/deliver.c b/usr/src/usr.sbin/sendmail/src/deliver.c
index cf21e3e..2872c00 100644 (file)
--- a/usr/src/usr.sbin/sendmail/src/deliver.c
+++ b/usr/src/usr.sbin/sendmail/src/deliver.c
@@ -7,7 +7,7 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)deliver.c  6.78 (Berkeley) %G%";
+static char sccsid[] = "@(#)deliver.c  6.79 (Berkeley) %G%";

 #endif /* not lint */
 
 #include "sendmail.h"
 #endif /* not lint */
 
 #include "sendmail.h"


@@ -55,8 +55,6 @@ sendall(e, mode)
        /* determine actual delivery mode */
        if (mode == SM_DEFAULT)
        {
        /* determine actual delivery mode */
        if (mode == SM_DEFAULT)
        {

-               extern bool shouldqueue();
-

                mode = e->e_sendmode;
                if (mode != SM_VERIFY &&
                    shouldqueue(e->e_msgpriority, e->e_ctime))
                mode = e->e_sendmode;
                if (mode != SM_VERIFY &&
                    shouldqueue(e->e_msgpriority, e->e_ctime))


@@ -102,8 +100,6 @@ sendall(e, mode)
 
        if (!MeToo && !bitset(QQUEUEUP, e->e_from.q_flags))
        {
 
        if (!MeToo && !bitset(QQUEUEUP, e->e_from.q_flags))
        {

-               extern ADDRESS *recipient();
-

                if (tTd(13, 5))
                {
                        printf("sendall: QDONTSEND ");
                if (tTd(13, 5))
                {
                        printf("sendall: QDONTSEND ");


@@ -590,9 +586,6 @@ deliver(e, firstto)
        char buf[MAXNAME];
        char rpathbuf[MAXNAME];         /* translated return path */
        extern int checkcompat();
        char buf[MAXNAME];
        char rpathbuf[MAXNAME];         /* translated return path */
        extern int checkcompat();

-       extern ADDRESS *getctladdr();
-       extern char *remotename();
-       extern char *hostsignature();

        extern FILE *fdopen();
 
        errno = 0;
        extern FILE *fdopen();
 
        errno = 0;


@@ -944,8 +937,6 @@ deliver(e, firstto)
 #ifdef DAEMON
                register int i;
                register u_short port;
 #ifdef DAEMON
                register int i;
                register u_short port;

-               extern MCI *mci_get();
-               extern char *hostsignature();

 
                CurHostName = pv[1];
                curhost = hostsignature(m, pv[1], e);
 
                CurHostName = pv[1];
                curhost = hostsignature(m, pv[1], e);


@@ -1433,7 +1424,6 @@ markfailure(e, q, rcode)
        int rcode;
 {
        char buf[MAXLINE];
        int rcode;
 {
        char buf[MAXLINE];

-       extern char *pintvl();

 
        if (rcode == EX_OK)
                return;
 
        if (rcode == EX_OK)
                return;


@@ -1707,8 +1697,6 @@ logdelivery(m, mci, stat, e)
 # ifdef LOG
        char *curhost;
        char buf[512];
 # ifdef LOG
        char *curhost;
        char buf[512];

-       extern char *pintvl();
-       extern char *macvalue();

 
        (void) sprintf(buf, "delay=%s", pintvl(curtime() - e->e_ctime, TRUE));
 
 
        (void) sprintf(buf, "delay=%s", pintvl(curtime() - e->e_ctime, TRUE));
 


@@ -1722,7 +1710,6 @@ logdelivery(m, mci, stat, e)
        {
 # ifdef DAEMON
                extern SOCKADDR CurHostAddr;
        {
 # ifdef DAEMON
                extern SOCKADDR CurHostAddr;

-               extern char *anynet_ntoa();

 # endif
 
                (void) strcat(buf, ", relay=");
 # endif
 
                (void) strcat(buf, ", relay=");


@@ -2123,7 +2110,6 @@ hostsignature(m, host, e)
                {
                        register MCI *mci;
                        extern int errno;
                {
                        register MCI *mci;
                        extern int errno;

-                       extern MCI *mci_get();

 
                        /* update the connection info for this host */
                        mci = mci_get(hp, m);
 
                        /* update the connection info for this host */
                        mci = mci_get(hp, m);

diff --git a/usr/src/usr.sbin/sendmail/src/envelope.c b/usr/src/usr.sbin/sendmail/src/envelope.c
index e085418..51b2951 100644 (file)
--- a/usr/src/usr.sbin/sendmail/src/envelope.c
+++ b/usr/src/usr.sbin/sendmail/src/envelope.c
@@ -7,7 +7,7 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)envelope.c 6.34 (Berkeley) %G%";
+static char sccsid[] = "@(#)envelope.c 6.35 (Berkeley) %G%";

 #endif /* not lint */
 
 #include "sendmail.h"
 #endif /* not lint */
 
 #include "sendmail.h"


@@ -70,6 +70,7 @@ newenvelope(e, parent)
 **             Unlocks this queue file.
 */
 
 **             Unlocks this queue file.
 */
 

+void

 dropenvelope(e)
        register ENVELOPE *e;
 {
 dropenvelope(e)
        register ENVELOPE *e;
 {


@@ -179,6 +180,7 @@ dropenvelope(e)
 **             Marks the envelope as unallocated.
 */
 
 **             Marks the envelope as unallocated.
 */
 

+void

 clearenvelope(e, fullclear)
        register ENVELOPE *e;
        bool fullclear;
 clearenvelope(e, fullclear)
        register ENVELOPE *e;
        bool fullclear;


@@ -228,6 +230,7 @@ clearenvelope(e, fullclear)
 **             forms is set.
 */
 
 **             forms is set.
 */
 

+void

 initsys(e)
        register ENVELOPE *e;
 {
 initsys(e)
        register ENVELOPE *e;
 {


@@ -238,7 +241,7 @@ initsys(e)
        register char *p;
 #endif /* TTYNAME */
        extern char *ttyname();
        register char *p;
 #endif /* TTYNAME */
        extern char *ttyname();

-       extern char *macvalue();
+       extern void settime();

        extern char Version[];
 
        /*
        extern char Version[];
 
        /*


@@ -303,6 +306,7 @@ initsys(e)
 **             Sets the various time macros -- $a, $b, $d, $t.
 */
 
 **             Sets the various time macros -- $a, $b, $d, $t.
 */
 

+void

 settime(e)
        register ENVELOPE *e;
 {
 settime(e)
        register ENVELOPE *e;
 {


@@ -313,7 +317,6 @@ settime(e)
        register struct tm *tm;
        extern char *arpadate();
        extern struct tm *gmtime();
        register struct tm *tm;
        extern char *arpadate();
        extern struct tm *gmtime();

-       extern char *macvalue();

 
        now = curtime();
        tm = gmtime(&now);
 
        now = curtime();
        tm = gmtime(&now);


@@ -350,6 +353,7 @@ settime(e)
 #define O_APPEND       0
 #endif
 
 #define O_APPEND       0
 #endif
 

+void

 openxscript(e)
        register ENVELOPE *e;
 {
 openxscript(e)
        register ENVELOPE *e;
 {


@@ -378,6 +382,7 @@ openxscript(e)
 **             none.
 */
 
 **             none.
 */
 

+void

 closexscript(e)
        register ENVELOPE *e;
 {
 closexscript(e)
        register ENVELOPE *e;
 {


@@ -423,6 +428,7 @@ closexscript(e)
 **             sets sendmail's notion of who the from person is.
 */
 
 **             sets sendmail's notion of who the from person is.
 */
 

+void

 setsender(from, e, delimptr, internal)
        char *from;
        register ENVELOPE *e;
 setsender(from, e, delimptr, internal)
        char *from;
        register ENVELOPE *e;


@@ -436,8 +442,6 @@ setsender(from, e, delimptr, internal)
        char buf[MAXNAME];
        char pvpbuf[PSBUFSIZE];
        extern struct passwd *getpwnam();
        char buf[MAXNAME];
        char pvpbuf[PSBUFSIZE];
        extern struct passwd *getpwnam();

-       extern char *macvalue();
-       extern char **prescan();

        extern char *FullName;
 
        if (tTd(45, 1))
        extern char *FullName;
 
        if (tTd(45, 1))


@@ -451,11 +455,7 @@ setsender(from, e, delimptr, internal)
        if (bitset(EF_QUEUERUN, e->e_flags) || OpMode == MD_SMTP)
                realname = from;
        if (realname == NULL || realname[0] == '\0')
        if (bitset(EF_QUEUERUN, e->e_flags) || OpMode == MD_SMTP)
                realname = from;
        if (realname == NULL || realname[0] == '\0')

-       {
-               extern char *username();
-

                realname = username();
                realname = username();

-       }

 
        if (ConfigLevel < 2)
                SuprErrs = TRUE;
 
        if (ConfigLevel < 2)
                SuprErrs = TRUE;

diff --git a/usr/src/usr.sbin/sendmail/src/headers.c b/usr/src/usr.sbin/sendmail/src/headers.c
index a945dfe..b4df56a 100644 (file)
--- a/usr/src/usr.sbin/sendmail/src/headers.c
+++ b/usr/src/usr.sbin/sendmail/src/headers.c
@@ -7,7 +7,7 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)headers.c  6.34 (Berkeley) %G%";
+static char sccsid[] = "@(#)headers.c  6.35 (Berkeley) %G%";

 #endif /* not lint */
 
 # include <errno.h>
 #endif /* not lint */
 
 # include <errno.h>


@@ -395,7 +395,6 @@ eatheader(e, full)
                char *name;
                char hbuf[MAXNAME];
                char sbuf[MAXLINE];
                char *name;
                char hbuf[MAXNAME];
                char sbuf[MAXLINE];

-               extern char *macvalue();

 
                if (bitset(EF_RESPONSE, e->e_flags))
                        name = "[RESPONSE]";
 
                if (bitset(EF_RESPONSE, e->e_flags))
                        name = "[RESPONSE]";


@@ -405,8 +404,6 @@ eatheader(e, full)
                        name = RealHostName;
                else
                {
                        name = RealHostName;
                else
                {

-                       extern char *anynet_ntoa();
-

                        name = hbuf;
                        (void) sprintf(hbuf, "%.80s", RealHostName);
                        if (RealHostAddr.sa.sa_family != 0)
                        name = hbuf;
                        (void) sprintf(hbuf, "%.80s", RealHostName);
                        if (RealHostAddr.sa.sa_family != 0)


@@ -864,7 +861,6 @@ commaize(h, p, fp, oldstyle, m, e)
                char savechar;
                int flags;
                auto int stat;
                char savechar;
                int flags;
                auto int stat;

-               extern char *remotename();

 
                /*
                **  Find the end of the name.  New style names
 
                /*
                **  Find the end of the name.  New style names


@@ -882,7 +878,6 @@ commaize(h, p, fp, oldstyle, m, e)
                {
                        auto char *oldp;
                        char pvpbuf[PSBUFSIZE];
                {
                        auto char *oldp;
                        char pvpbuf[PSBUFSIZE];

-                       extern char **prescan();

 
                        (void) prescan(p, oldstyle ? ' ' : ',', pvpbuf, &oldp);
                        p = oldp;
 
                        (void) prescan(p, oldstyle ? ' ' : ',', pvpbuf, &oldp);
                        p = oldp;

diff --git a/usr/src/usr.sbin/sendmail/src/macro.c b/usr/src/usr.sbin/sendmail/src/macro.c
index 23f23da..3eaa253 100644 (file)
--- a/usr/src/usr.sbin/sendmail/src/macro.c
+++ b/usr/src/usr.sbin/sendmail/src/macro.c
@@ -7,7 +7,7 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)macro.c    6.7 (Berkeley) %G%";
+static char sccsid[] = "@(#)macro.c    6.8 (Berkeley) %G%";

 #endif /* not lint */
 
 # include "sendmail.h"
 #endif /* not lint */
 
 # include "sendmail.h"


@@ -30,6 +30,7 @@ static char sccsid[] = "@(#)macro.c   6.7 (Berkeley) %G%";
 **             none.
 */
 
 **             none.
 */
 

+void

 expand(s, buf, buflim, e)
        register char *s;
        register char *buf;
 expand(s, buf, buflim, e)
        register char *s;
        register char *buf;


@@ -43,7 +44,6 @@ expand(s, buf, buflim, e)
        int i;
        int iflev;              /* if nesting level */
        char xbuf[BUFSIZ];
        int i;
        int iflev;              /* if nesting level */
        char xbuf[BUFSIZ];

-       extern char *macvalue();

 
        if (tTd(35, 24))
        {
 
        if (tTd(35, 24))
        {


@@ -203,6 +203,7 @@ expand(s, buf, buflim, e)
 **             are available.
 */
 
 **             are available.
 */
 

+void

 define(n, v, e)
        char n;
        char *v;
 define(n, v, e)
        char n;
        char *v;

diff --git a/usr/src/usr.sbin/sendmail/src/main.c b/usr/src/usr.sbin/sendmail/src/main.c
index b669505..330e6ed 100644 (file)
--- a/usr/src/usr.sbin/sendmail/src/main.c
+++ b/usr/src/usr.sbin/sendmail/src/main.c
@@ -13,7 +13,7 @@ char copyright[] =
 #endif /* not lint */
 
 #ifndef lint
 #endif /* not lint */
 
 #ifndef lint

-static char sccsid[] = "@(#)main.c     6.66 (Berkeley) %G%";
+static char sccsid[] = "@(#)main.c     6.67 (Berkeley) %G%";

 #endif /* not lint */
 
 #define        _DEFINE
 #endif /* not lint */
 
 #define        _DEFINE


@@ -125,12 +125,10 @@ main(argc, argv, envp)
        extern int optind;
        extern time_t convtime();
        extern putheader(), putbody();
        extern int optind;
        extern time_t convtime();
        extern putheader(), putbody();

-       extern ENVELOPE *newenvelope();

        extern void intsig();
        extern char **myhostname();
        extern char *arpadate();
        extern char *getauthinfo();
        extern void intsig();
        extern char **myhostname();
        extern char *arpadate();
        extern char *getauthinfo();

-       extern char *macvalue();

        extern char *optarg;
        extern char **environ;
 
        extern char *optarg;
        extern char **environ;
 


@@ -812,7 +810,6 @@ main(argc, argv, envp)
                                continue;
                        do
                        {
                                continue;
                        do
                        {

-                               extern char **prescan();

                                char pvpbuf[PSBUFSIZE];
 
                                pvp = prescan(++p, ',', pvpbuf, &delimptr);
                                char pvpbuf[PSBUFSIZE];
 
                                pvp = prescan(++p, ',', pvpbuf, &delimptr);


@@ -877,8 +874,6 @@ main(argc, argv, envp)
                        strcat(dtype, "+SMTP");
                if (QueueIntvl != 0)
                {
                        strcat(dtype, "+SMTP");
                if (QueueIntvl != 0)
                {

-                       extern char *pintvl();
-

                        strcat(dtype, "+queueing@");
                        strcat(dtype, pintvl(QueueIntvl, TRUE));
                }
                        strcat(dtype, "+queueing@");
                        strcat(dtype, pintvl(QueueIntvl, TRUE));
                }


@@ -1239,7 +1234,6 @@ thaw(freezefile, binfile)
        extern char edata, end;
        extern char Version[];
        extern char **myhostname();
        extern char edata, end;
        extern char Version[];
        extern char **myhostname();

-       extern char *macvalue();

        extern BRK_TYPE brk();
 
        if (freezefile == NULL)
        extern BRK_TYPE brk();
 
        if (freezefile == NULL)

diff --git a/usr/src/usr.sbin/sendmail/src/parseaddr.c b/usr/src/usr.sbin/sendmail/src/parseaddr.c
index 3bbe6cc..e5b76ab 100644 (file)
--- a/usr/src/usr.sbin/sendmail/src/parseaddr.c
+++ b/usr/src/usr.sbin/sendmail/src/parseaddr.c
@@ -7,7 +7,7 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)parseaddr.c        6.56 (Berkeley) %G%";
+static char sccsid[] = "@(#)parseaddr.c        6.57 (Berkeley) %G%";

 #endif /* not lint */
 
 #include "sendmail.h"
 #endif /* not lint */
 
 #include "sendmail.h"


@@ -733,7 +733,6 @@ _rewrite(pvp, ruleset)
        int subr;                       /* subroutine number if >= 0 */
        bool dolookup;                  /* do host aliasing */
        char *npvp[MAXATOM+1];          /* temporary space for rebuild */
        int subr;                       /* subroutine number if >= 0 */
        bool dolookup;                  /* do host aliasing */
        char *npvp[MAXATOM+1];          /* temporary space for rebuild */

-       extern char *macvalue();

        char tokbuf[MAXNAME+1];         /* for concatenated class tokens */
        int nloops, nmatches = 0;       /* for looping rule checks */
        struct rewrite *prev_rwr;       /* pointer to previous rewrite rule */
        char tokbuf[MAXNAME+1];         /* for concatenated class tokens */
        int nloops, nmatches = 0;       /* for looping rule checks */
        struct rewrite *prev_rwr;       /* pointer to previous rewrite rule */

diff --git a/usr/src/usr.sbin/sendmail/src/queue.c b/usr/src/usr.sbin/sendmail/src/queue.c
index 479bcb3..b59e53a 100644 (file)
--- a/usr/src/usr.sbin/sendmail/src/queue.c
+++ b/usr/src/usr.sbin/sendmail/src/queue.c
@@ -10,9 +10,9 @@
 
 #ifndef lint
 #ifdef QUEUE
 
 #ifndef lint
 #ifdef QUEUE

-static char sccsid[] = "@(#)queue.c    6.57 (Berkeley) %G% (with queueing)";
+static char sccsid[] = "@(#)queue.c    6.58 (Berkeley) %G% (with queueing)";

 #else
 #else

-static char sccsid[] = "@(#)queue.c    6.57 (Berkeley) %G% (without queueing)";
+static char sccsid[] = "@(#)queue.c    6.58 (Berkeley) %G% (without queueing)";

 #endif
 #endif /* not lint */
 
 #endif
 #endif /* not lint */
 


@@ -70,7 +70,6 @@ queueup(e, queueall, announce)
        register char *p;
        MAILER nullmailer;
        char buf[MAXLINE], tf[MAXLINE];
        register char *p;
        MAILER nullmailer;
        char buf[MAXLINE], tf[MAXLINE];

-       extern char *macvalue();

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


@@ -90,8 +89,6 @@ queueup(e, queueall, announce)
                /* get a locked tf file */
                for (i = 100; --i >= 0; )
                {
                /* get a locked tf file */
                for (i = 100; --i >= 0; )
                {

-                       extern bool lockfile();
-

                        fd = open(tf, O_CREAT|O_WRONLY|O_EXCL, FileMode);
                        if (fd < 0)
                        {
                        fd = open(tf, O_CREAT|O_WRONLY|O_EXCL, FileMode);
                        if (fd < 0)
                        {


@@ -320,7 +317,6 @@ printctladdr(a, tfp)
        uid_t uid;
        static ADDRESS *lastctladdr;
        static uid_t lastuid;
        uid_t uid;
        static ADDRESS *lastctladdr;
        static uid_t lastuid;

-       extern ADDRESS *getctladdr();

 
        /* initialization */
        if (a == NULL || tfp == NULL)
 
        /* initialization */
        if (a == NULL || tfp == NULL)


@@ -381,10 +377,8 @@ ENVELOPE   QueueEnvelope;          /* the queue run envelope */
 runqueue(forkflag)
        bool forkflag;
 {
 runqueue(forkflag)
        bool forkflag;
 {

-       extern bool shouldqueue();

        register ENVELOPE *e;
        extern ENVELOPE BlankEnvelope;
        register ENVELOPE *e;
        extern ENVELOPE BlankEnvelope;

-       extern ENVELOPE *newenvelope();

 
        /*
        **  If no work will ever be selected, don't even bother reading
 
        /*
        **  If no work will ever be selected, don't even bother reading


@@ -478,7 +472,6 @@ runqueue(forkflag)
        while (WorkQ != NULL)
        {
                WORK *w = WorkQ;
        while (WorkQ != NULL)
        {
                WORK *w = WorkQ;

-               extern bool shouldqueue();

 
                WorkQ = WorkQ->w_next;
 
 
                WorkQ = WorkQ->w_next;
 


@@ -583,7 +576,6 @@ orderq(doall)
        {
                FILE *cf;
                char lbuf[MAXNAME];
        {
                FILE *cf;
                char lbuf[MAXNAME];

-               extern bool shouldqueue();

                extern bool strcontainedin();
 
                /* is this an interesting entry? */
                extern bool strcontainedin();
 
                /* is this an interesting entry? */


@@ -886,10 +878,8 @@ readqf(e)
        char *bp;
        char qf[20];
        char buf[MAXLINE];
        char *bp;
        char qf[20];
        char buf[MAXLINE];

-       extern char *fgetfolded();

        extern long atol();
        extern ADDRESS *setctluser();
        extern long atol();
        extern ADDRESS *setctluser();

-       extern bool lockfile();

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


@@ -1164,8 +1154,6 @@ printqueue()
                int flags = 0;
                char message[MAXLINE];
                char bodytype[MAXNAME];
                int flags = 0;
                char message[MAXLINE];
                char bodytype[MAXNAME];

-               extern bool shouldqueue();
-               extern bool lockfile();

 
                f = fopen(w->w_name, "r");
                if (f == NULL)
 
                f = fopen(w->w_name, "r");
                if (f == NULL)


@@ -1299,7 +1287,6 @@ queuename(e, type)
        time_t now;
        struct tm *tm;
        static char buf[MAXNAME];
        time_t now;
        struct tm *tm;
        static char buf[MAXNAME];

-       extern bool lockfile();

 
        if (e->e_id == NULL)
        {
 
        if (e->e_id == NULL)
        {

diff --git a/usr/src/usr.sbin/sendmail/src/readcf.c b/usr/src/usr.sbin/sendmail/src/readcf.c
index 297a683..4d3a41d 100644 (file)
--- a/usr/src/usr.sbin/sendmail/src/readcf.c
+++ b/usr/src/usr.sbin/sendmail/src/readcf.c
@@ -7,7 +7,7 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)readcf.c   6.39 (Berkeley) %G%";
+static char sccsid[] = "@(#)readcf.c   6.40 (Berkeley) %G%";

 #endif /* not lint */
 
 # include "sendmail.h"
 #endif /* not lint */
 
 # include "sendmail.h"


@@ -74,12 +74,10 @@ readcf(cfname)
        int nfuzzy;
        char buf[MAXLINE];
        register char *p;
        int nfuzzy;
        char buf[MAXLINE];
        register char *p;

-       extern char **prescan();

        extern char **copyplist();
        struct stat statb;
        char exbuf[MAXLINE];
        char pvpbuf[PSBUFSIZE];
        extern char **copyplist();
        struct stat statb;
        char exbuf[MAXLINE];
        char pvpbuf[PSBUFSIZE];

-       extern char *fgetfolded();

        extern char *munchstring();
        extern void makemapentry();
 
        extern char *munchstring();
        extern void makemapentry();
 


@@ -958,7 +956,6 @@ setoption(opt, val, sticky)
        extern int QueueLA;
        extern int RefuseLA;
        extern bool trusteduser();
        extern int QueueLA;
        extern int RefuseLA;
        extern bool trusteduser();

-       extern char *username();

 
        if (tTd(37, 1))
                printf("setoption %c=%s", opt, val);
 
        if (tTd(37, 1))
                printf("setoption %c=%s", opt, val);

diff --git a/usr/src/usr.sbin/sendmail/src/recipient.c b/usr/src/usr.sbin/sendmail/src/recipient.c
index 55f7bc9..dcaa418 100644 (file)
--- a/usr/src/usr.sbin/sendmail/src/recipient.c
+++ b/usr/src/usr.sbin/sendmail/src/recipient.c
@@ -7,7 +7,7 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)recipient.c        6.40 (Berkeley) %G%";
+static char sccsid[] = "@(#)recipient.c        6.41 (Berkeley) %G%";

 #endif /* not lint */
 
 # include "sendmail.h"
 #endif /* not lint */
 
 # include "sendmail.h"


@@ -117,7 +117,6 @@ sendto(list, copyf, ctladdr, qflags)
        {
                register ADDRESS *a = al;
                extern ADDRESS *recipient();
        {
                register ADDRESS *a = al;
                extern ADDRESS *recipient();

-               extern ADDRESS *recipient();

 
                al = a->q_next;
                sibl = recipient(a);
 
                al = a->q_next;
                sibl = recipient(a);


@@ -197,8 +196,6 @@ addrref(a, r)
 **             none.
 */
 
 **             none.
 */
 

-extern ADDRESS *getctladdr();
-

 ADDRESS *
 ADDRESS *
 recipient(a, sendq, e)
 ADDRESS *
 ADDRESS *
 recipient(a, sendq, e)

diff --git a/usr/src/usr.sbin/sendmail/src/savemail.c b/usr/src/usr.sbin/sendmail/src/savemail.c
index 88ce126..51be0cb 100644 (file)
--- a/usr/src/usr.sbin/sendmail/src/savemail.c
+++ b/usr/src/usr.sbin/sendmail/src/savemail.c
@@ -7,7 +7,7 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)savemail.c 6.43 (Berkeley) %G%";
+static char sccsid[] = "@(#)savemail.c 6.44 (Berkeley) %G%";

 #endif /* not lint */
 
 # include <pwd.h>
 #endif /* not lint */
 
 # include <pwd.h>


@@ -396,7 +396,6 @@ returntosender(msg, returnq, sendbody, e)
        extern putheader(), errbody();
        register ENVELOPE *ee;
        ENVELOPE *oldcur = CurEnv;
        extern putheader(), errbody();
        register ENVELOPE *ee;
        ENVELOPE *oldcur = CurEnv;

-       extern ENVELOPE *newenvelope();

        ENVELOPE errenvelope;
        static int returndepth;
        register ADDRESS *q;
        ENVELOPE errenvelope;
        static int returndepth;
        register ADDRESS *q;

diff --git a/usr/src/usr.sbin/sendmail/src/sendmail.h b/usr/src/usr.sbin/sendmail/src/sendmail.h
index bce3ab7..3eda43d 100644 (file)
--- a/usr/src/usr.sbin/sendmail/src/sendmail.h
+++ b/usr/src/usr.sbin/sendmail/src/sendmail.h
@@ -5,7 +5,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)sendmail.h  6.66 (Berkeley) %G%
+ *     @(#)sendmail.h  6.67 (Berkeley) %G%

  */
 
 /*
  */
 
 /*


@@ -15,7 +15,7 @@
 # ifdef _DEFINE
 # define EXTERN
 # ifndef lint
 # ifdef _DEFINE
 # define EXTERN
 # ifndef lint

-static char SmailSccsId[] =    "@(#)sendmail.h 6.66            %G%";
+static char SmailSccsId[] =    "@(#)sendmail.h 6.67            %G%";

 # endif
 # else /*  _DEFINE */
 # define EXTERN extern
 # endif
 # else /*  _DEFINE */
 # define EXTERN extern


@@ -581,7 +581,8 @@ typedef struct symtab       STAB;
 # define s_alias       s_value.sv_alias
 # define s_mci         s_value.sv_mci
 
 # define s_alias       s_value.sv_alias
 # define s_mci         s_value.sv_mci
 

-extern STAB    *stab();
+extern STAB            *stab __P((char *, int, int));
+extern void            stabapply __P((void (*)(STAB *)));

 
 /* opcodes to stab */
 # define ST_FIND       0       /* find entry */
 
 /* opcodes to stab */
 # define ST_FIND       0       /* find entry */


@@ -872,6 +873,28 @@ extern char                *queuename __P((ENVELOPE *, int));
 extern time_t          curtime __P(());
 extern bool            transienterror __P((int));
 extern const char      *errstring __P((int));
 extern time_t          curtime __P(());
 extern bool            transienterror __P((int));
 extern const char      *errstring __P((int));

+extern void            expand __P((char *, char *, char *, ENVELOPE *));
+extern void            define __P((char, char *, ENVELOPE *));
+extern char            *macvalue __P((char, ENVELOPE *));
+extern char            **prescan __P((char *, char, char[], char **));
+extern char            *fgetfolded __P((char *, int, FILE *));
+extern ADDRESS         *recipient __P((ADDRESS *, ADDRESS **, ENVELOPE *));
+extern ENVELOPE                *newenvelope __P((ENVELOPE *, ENVELOPE *));
+extern void            dropenvelope __P((ENVELOPE *));
+extern void            clearenvelope __P((ENVELOPE *, bool));
+extern char            *username __P(());
+extern MCI             *mci_get __P((char *, MAILER *));
+extern char            *pintvl __P((time_t, bool));
+extern char            *sfgets __P((char *, int, FILE *, time_t));
+extern char            *map_rewrite __P((MAP *, char *, int, char **));
+extern ADDRESS         *getctladdr __P((ADDRESS *));
+extern char            *anynet_ntoa __P((SOCKADDR *));
+extern char            *remotename __P((char *, MAILER *, int, int *, ENVELOPE *));
+extern bool            shouldqueue __P((long, time_t));
+extern bool            lockfile __P((int, char *, int));
+extern char            *hostsignature __P((MAILER *, char *, ENVELOPE *));
+extern void            openxscript __P((ENVELOPE *));
+extern void            closexscript __P((ENVELOPE *));

 
 /* ellipsis is a different case though */
 #ifdef __STDC__
 
 /* ellipsis is a different case though */
 #ifdef __STDC__

diff --git a/usr/src/usr.sbin/sendmail/src/srvrsmtp.c b/usr/src/usr.sbin/sendmail/src/srvrsmtp.c
index 7d02e24..65783b2 100644 (file)
--- a/usr/src/usr.sbin/sendmail/src/srvrsmtp.c
+++ b/usr/src/usr.sbin/sendmail/src/srvrsmtp.c
@@ -10,9 +10,9 @@
 
 #ifndef lint
 #ifdef SMTP
 
 #ifndef lint
 #ifdef SMTP

-static char sccsid[] = "@(#)srvrsmtp.c 6.55 (Berkeley) %G% (with SMTP)";
+static char sccsid[] = "@(#)srvrsmtp.c 6.56 (Berkeley) %G% (with SMTP)";

 #else
 #else

-static char sccsid[] = "@(#)srvrsmtp.c 6.55 (Berkeley) %G% (without SMTP)";
+static char sccsid[] = "@(#)srvrsmtp.c 6.56 (Berkeley) %G% (without SMTP)";

 #endif
 #endif /* not lint */
 
 #endif
 #endif /* not lint */
 

diff --git a/usr/src/usr.sbin/sendmail/src/udb.c b/usr/src/usr.sbin/sendmail/src/udb.c
index c552ddf..6ffc0e7 100644 (file)
--- a/usr/src/usr.sbin/sendmail/src/udb.c
+++ b/usr/src/usr.sbin/sendmail/src/udb.c
@@ -8,9 +8,9 @@
 
 #ifndef lint
 #ifdef USERDB
 
 #ifndef lint
 #ifdef USERDB

-static char sccsid [] = "@(#)udb.c     6.20 (Berkeley) %G% (with USERDB)";
+static char sccsid [] = "@(#)udb.c     6.21 (Berkeley) %G% (with USERDB)";

 #else
 #else

-static char sccsid [] = "@(#)udb.c     6.20 (Berkeley) %G% (without USERDB)";
+static char sccsid [] = "@(#)udb.c     6.21 (Berkeley) %G% (without USERDB)";

 #endif
 #endif
 
 #endif
 #endif
 


@@ -603,7 +603,7 @@ _udbx_init()
                        {
                          case UDB_REMOTE:
                                printf("REMOTE: addr %s, timeo %d\n",
                        {
                          case UDB_REMOTE:
                                printf("REMOTE: addr %s, timeo %d\n",

-                                       anynet_ntoa(&up->udb_addr),
+                                       anynet_ntoa((SOCKADDR *) &up->udb_addr),

                                        up->udb_timeout);
                                break;
 
                                        up->udb_timeout);
                                break;
 

diff --git a/usr/src/usr.sbin/sendmail/src/usersmtp.c b/usr/src/usr.sbin/sendmail/src/usersmtp.c
index 88d3635..ba74a85 100644 (file)
--- a/usr/src/usr.sbin/sendmail/src/usersmtp.c
+++ b/usr/src/usr.sbin/sendmail/src/usersmtp.c
@@ -10,9 +10,9 @@
 
 #ifndef lint
 #ifdef SMTP
 
 #ifndef lint
 #ifdef SMTP

-static char sccsid[] = "@(#)usersmtp.c 6.31 (Berkeley) %G% (with SMTP)";
+static char sccsid[] = "@(#)usersmtp.c 6.32 (Berkeley) %G% (with SMTP)";

 #else
 #else

-static char sccsid[] = "@(#)usersmtp.c 6.31 (Berkeley) %G% (without SMTP)";
+static char sccsid[] = "@(#)usersmtp.c 6.32 (Berkeley) %G% (without SMTP)";

 #endif
 #endif /* not lint */
 
 #endif
 #endif /* not lint */
 


@@ -63,7 +63,6 @@ smtpinit(m, mci, e)
 {
        register int r;
        register char *p;
 {
        register int r;
        register char *p;

-       extern STAB *stab();

        extern void esmtp_check();
        extern void helo_options();
 
        extern void esmtp_check();
        extern void helo_options();
 

diff --git a/usr/src/usr.sbin/sendmail/src/util.c b/usr/src/usr.sbin/sendmail/src/util.c
index dc86db4..038ea79 100644 (file)
--- a/usr/src/usr.sbin/sendmail/src/util.c
+++ b/usr/src/usr.sbin/sendmail/src/util.c
@@ -7,7 +7,7 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)util.c     6.18 (Berkeley) %G%";
+static char sccsid[] = "@(#)util.c     6.19 (Berkeley) %G%";

 #endif /* not lint */
 
 # include "sendmail.h"
 #endif /* not lint */
 
 # include "sendmail.h"


@@ -491,7 +491,6 @@ dfopen(filename, omode, cmode)
        if (fd >= 0 && fstat(fd, &st) >= 0 && S_ISREG(st.st_mode))
        {
                int locktype;
        if (fd >= 0 && fstat(fd, &st) >= 0 && S_ISREG(st.st_mode))
        {
                int locktype;

-               extern bool lockfile();

 
                /* lock the file to avoid accidental conflicts */
                if ((omode & O_ACCMODE) != O_RDONLY)
 
                /* lock the file to avoid accidental conflicts */
                if ((omode & O_ACCMODE) != O_RDONLY)