facilities in syslog

SCCS-vsn: libexec/comsat/comsat.c 5.4
SCCS-vsn: libexec/rshd/rshd.c 5.3
SCCS-vsn: libexec/tftpd/tftpd.c 5.2
SCCS-vsn: usr.bin/login/login.c 5.5
SCCS-vsn: usr.bin/login/login.c.1 5.5
SCCS-vsn: sys/vax/uba/up.c 6.9
SCCS-vsn: usr.sbin/rwhod/rwhod.c 5.5
SCCS-vsn: old/init/init.c 5.5
SCCS-vsn: sbin/init/init.c 5.5
SCCS-vsn: libexec/rlogind/rlogind.c 5.6
SCCS-vsn: libexec/telnetd/telnetd.c 5.3
SCCS-vsn: usr.sbin/inetd/inetd.c 5.2
SCCS-vsn: usr.sbin/sendmail/src/err.c 5.3
SCCS-vsn: usr.sbin/sendmail/src/main.c 5.5
SCCS-vsn: usr.sbin/sendmail/src/daemon.c 5.7
SCCS-vsn: usr.sbin/sendmail/src/usersmtp.c 5.4
SCCS-vsn: usr.sbin/sendmail/src/version.c 5.8
SCCS-vsn: usr.sbin/lpr/lpd/printjob.c 5.2
SCCS-vsn: usr.sbin/lpr/lpd/lpd.c 5.2

diff --git a/usr/src/libexec/comsat/comsat.c b/usr/src/libexec/comsat/comsat.c
index dcecce4..04ae902 100644 (file)
--- a/usr/src/libexec/comsat/comsat.c
+++ b/usr/src/libexec/comsat/comsat.c
@@ -11,7 +11,7 @@ char copyright[] =
 #endif not lint
 
 #ifndef lint
 #endif not lint
 
 #ifndef lint

-static char sccsid[] = "@(#)comsat.c   5.3 (Berkeley) %G%";
+static char sccsid[] = "@(#)comsat.c   5.4 (Berkeley) %G%";

 #endif not lint
 
 #include <sys/types.h>
 #endif not lint
 
 #include <sys/types.h>


@@ -72,7 +72,7 @@ main(argc, argv)
        }
        chdir("/usr/spool/mail");
        if ((uf = open("/etc/utmp",0)) < 0) {
        }
        chdir("/usr/spool/mail");
        if ((uf = open("/etc/utmp",0)) < 0) {

-               openlog("comsat", 0, 0);
+               openlog("comsat", 0, LOG_DAEMON);

                syslog(LOG_ERR, "/etc/utmp: %m");
                (void) recv(0, msgbuf, sizeof (msgbuf) - 1, 0);
                exit(1);
                syslog(LOG_ERR, "/etc/utmp: %m");
                (void) recv(0, msgbuf, sizeof (msgbuf) - 1, 0);
                exit(1);

diff --git a/usr/src/libexec/rlogind/rlogind.c b/usr/src/libexec/rlogind/rlogind.c
index 28f830c..6588f14 100644 (file)
--- a/usr/src/libexec/rlogind/rlogind.c
+++ b/usr/src/libexec/rlogind/rlogind.c
@@ -56,6 +56,7 @@ main(argc, argv)
        int on = 1, options = 0, fromlen;
        struct sockaddr_in from;
 
        int on = 1, options = 0, fromlen;
        struct sockaddr_in from;
 

+       openlog("rlogind", LOG_PID | LOG_AUTH, LOG_AUTH);

        fromlen = sizeof (from);
        if (getpeername(0, &from, &fromlen) < 0) {
                fprintf(stderr, "%s: ", argv[0]);
        fromlen = sizeof (from);
        if (getpeername(0, &from, &fromlen) < 0) {
                fprintf(stderr, "%s: ", argv[0]);


@@ -63,7 +64,6 @@ main(argc, argv)
                _exit(1);
        }
        if (setsockopt(0, SOL_SOCKET, SO_KEEPALIVE, &on, sizeof (on)) < 0) {
                _exit(1);
        }
        if (setsockopt(0, SOL_SOCKET, SO_KEEPALIVE, &on, sizeof (on)) < 0) {

-               openlog(argv[0], LOG_PID, 0);

                syslog(LOG_WARNING, "setsockopt (SO_KEEPALIVE): %m");
        }
        doit(0, &from);
                syslog(LOG_WARNING, "setsockopt (SO_KEEPALIVE): %m");
        }
        doit(0, &from);

diff --git a/usr/src/libexec/rshd/rshd.c b/usr/src/libexec/rshd/rshd.c
index 15b85ad..77d7e85 100644 (file)
--- a/usr/src/libexec/rshd/rshd.c
+++ b/usr/src/libexec/rshd/rshd.c
@@ -11,7 +11,7 @@ char copyright[] =
 #endif not lint
 
 #ifndef lint
 #endif not lint
 
 #ifndef lint

-static char sccsid[] = "@(#)rshd.c     5.2 (Berkeley) %G%";
+static char sccsid[] = "@(#)rshd.c     5.3 (Berkeley) %G%";

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


@@ -48,6 +48,7 @@ main(argc, argv)
        int on = 1, fromlen;
        struct sockaddr_in from;
 
        int on = 1, fromlen;
        struct sockaddr_in from;
 

+       openlog("rsh", LOG_PID | LOG_ODELAY, LOG_DAEMON);

        fromlen = sizeof (from);
        if (getpeername(0, &from, &fromlen) < 0) {
                fprintf(stderr, "%s: ", argv[0]);
        fromlen = sizeof (from);
        if (getpeername(0, &from, &fromlen) < 0) {
                fprintf(stderr, "%s: ", argv[0]);


@@ -55,13 +56,11 @@ main(argc, argv)
                _exit(1);
        }
        if (setsockopt(0, SOL_SOCKET, SO_KEEPALIVE, &on, sizeof (on)) < 0) {
                _exit(1);
        }
        if (setsockopt(0, SOL_SOCKET, SO_KEEPALIVE, &on, sizeof (on)) < 0) {

-               openlog(argv[0], LOG_PID, 0);

                syslog(LOG_WARNING, "setsockopt (SO_KEEPALIVE): %m");
        }
        linger.l_onoff = 1;
        linger.l_linger = 60;                   /* XXX */
        if (setsockopt(0, SOL_SOCKET, SO_LINGER, &linger, sizeof (linger)) < 0) {
                syslog(LOG_WARNING, "setsockopt (SO_KEEPALIVE): %m");
        }
        linger.l_onoff = 1;
        linger.l_linger = 60;                   /* XXX */
        if (setsockopt(0, SOL_SOCKET, SO_LINGER, &linger, sizeof (linger)) < 0) {

-               openlog(argv[0], LOG_PID, 0);

                syslog(LOG_WARNING, "setsockopt (SO_LINGER): %m");
        }
        doit(dup(0), &from);
                syslog(LOG_WARNING, "setsockopt (SO_LINGER): %m");
        }
        doit(dup(0), &from);


@@ -102,7 +101,6 @@ doit(f, fromp)
        fromp->sin_port = ntohs((u_short)fromp->sin_port);
        if (fromp->sin_family != AF_INET ||
            fromp->sin_port >= IPPORT_RESERVED) {
        fromp->sin_port = ntohs((u_short)fromp->sin_port);
        if (fromp->sin_family != AF_INET ||
            fromp->sin_port >= IPPORT_RESERVED) {

-               openlog("rshd", LOG_PID, 0);

                syslog(LOG_ERR, "malformed from address\n");
                exit(1);
        }
                syslog(LOG_ERR, "malformed from address\n");
                exit(1);
        }


@@ -111,7 +109,6 @@ doit(f, fromp)
        for (;;) {
                char c;
                if (read(f, &c, 1) != 1) {
        for (;;) {
                char c;
                if (read(f, &c, 1) != 1) {

-                       openlog("rshd", LOG_PID, 0);

                        syslog(LOG_ERR, "read: %m");
                        shutdown(f, 1+1);
                        exit(1);
                        syslog(LOG_ERR, "read: %m");
                        shutdown(f, 1+1);
                        exit(1);


@@ -125,18 +122,15 @@ doit(f, fromp)
                int lport = IPPORT_RESERVED - 1, retryshift;
                s = rresvport(&lport);
                if (s < 0) {
                int lport = IPPORT_RESERVED - 1, retryshift;
                s = rresvport(&lport);
                if (s < 0) {

-                       openlog("rshd", LOG_PID, 0);

                        syslog(LOG_ERR, "can't get stderr port: %m");
                        exit(1);
                }
                if (port >= IPPORT_RESERVED) {
                        syslog(LOG_ERR, "can't get stderr port: %m");
                        exit(1);
                }
                if (port >= IPPORT_RESERVED) {

-                       openlog("rshd", LOG_PID, 0);

                        syslog(LOG_ERR, "2nd port not reserved\n");
                        exit(1);
                }
                fromp->sin_port = htons((u_short)port);
                if (connect(s, fromp, sizeof (*fromp), 0) < 0) {
                        syslog(LOG_ERR, "2nd port not reserved\n");
                        exit(1);
                }
                fromp->sin_port = htons((u_short)port);
                if (connect(s, fromp, sizeof (*fromp), 0) < 0) {

-                       openlog("rshd", LOG_PID, 0);

                        syslog(LOG_ERR, "connect: %m");
                        exit(1);
                }
                        syslog(LOG_ERR, "connect: %m");
                        exit(1);
                }

diff --git a/usr/src/libexec/telnetd/telnetd.c b/usr/src/libexec/telnetd/telnetd.c
index 5d13921..35836d6 100644 (file)
--- a/usr/src/libexec/telnetd/telnetd.c
+++ b/usr/src/libexec/telnetd/telnetd.c
@@ -11,7 +11,7 @@ char copyright[] =
 #endif not lint
 
 #ifndef lint
 #endif not lint
 
 #ifndef lint

-static char sccsid[] = "@(#)telnetd.c  5.2 (Berkeley) %G%";
+static char sccsid[] = "@(#)telnetd.c  5.3 (Berkeley) %G%";

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


@@ -66,6 +66,7 @@ main(argc, argv)
        struct sockaddr_in from;
        int on = 1, fromlen;
 
        struct sockaddr_in from;
        int on = 1, fromlen;
 

+       openlog("telnetd", LOG_PID | LOG_ODELAY, LOG_DAEMON);

        fromlen = sizeof (from);
        if (getpeername(0, &from, &fromlen) < 0) {
                fprintf(stderr, "%s: ", argv[0]);
        fromlen = sizeof (from);
        if (getpeername(0, &from, &fromlen) < 0) {
                fprintf(stderr, "%s: ", argv[0]);


@@ -73,7 +74,6 @@ main(argc, argv)
                _exit(1);
        }
        if (setsockopt(0, SOL_SOCKET, SO_KEEPALIVE, &on, sizeof (on)) < 0) {
                _exit(1);
        }
        if (setsockopt(0, SOL_SOCKET, SO_KEEPALIVE, &on, sizeof (on)) < 0) {

-               openlog(argv[0], LOG_PID, 0);

                syslog(LOG_WARNING, "setsockopt (SO_KEEPALIVE): %m");
        }
        doit(0, &from);
                syslog(LOG_WARNING, "setsockopt (SO_KEEPALIVE): %m");
        }
        doit(0, &from);

diff --git a/usr/src/libexec/tftpd/tftpd.c b/usr/src/libexec/tftpd/tftpd.c
index da3d85e..8fc7d88 100644 (file)
--- a/usr/src/libexec/tftpd/tftpd.c
+++ b/usr/src/libexec/tftpd/tftpd.c
@@ -11,7 +11,7 @@ char copyright[] =
 #endif not lint
 
 #ifndef lint
 #endif not lint
 
 #ifndef lint

-static char sccsid[] = "@(#)tftpd.c    5.1 (Berkeley) %G%";
+static char sccsid[] = "@(#)tftpd.c    5.2 (Berkeley) %G%";

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


@@ -51,6 +51,7 @@ main()
        register struct tftphdr *tp;
        register int n;
 
        register struct tftphdr *tp;
        register int n;
 

+       openlog("tftpd", LOG_PID, LOG_DAEMON);

        alarm(10);
        fromlen = sizeof (from);
        n = recvfrom(0, buf, sizeof (buf), 0,
        alarm(10);
        fromlen = sizeof (from);
        n = recvfrom(0, buf, sizeof (buf), 0,


@@ -65,17 +66,14 @@ main()
        close(1);
        peer = socket(AF_INET, SOCK_DGRAM, 0);
        if (peer < 0) {
        close(1);
        peer = socket(AF_INET, SOCK_DGRAM, 0);
        if (peer < 0) {

-               openlog("tftpd", LOG_PID, 0);

                syslog(LOG_ERR, "socket: %m");
                exit(1);
        }
        if (bind(peer, (caddr_t)&sin, sizeof (sin)) < 0) {
                syslog(LOG_ERR, "socket: %m");
                exit(1);
        }
        if (bind(peer, (caddr_t)&sin, sizeof (sin)) < 0) {

-               openlog("tftpd", LOG_PID, 0);

                syslog(LOG_ERR, "bind: %m");
                exit(1);
        }
        if (connect(peer, (caddr_t)&from, sizeof(from)) < 0) {
                syslog(LOG_ERR, "bind: %m");
                exit(1);
        }
        if (connect(peer, (caddr_t)&from, sizeof(from)) < 0) {

-               openlog("tftpd", LOG_PID, 0);

                syslog(LOG_ERR, "connect: %m");
                exit(1);
        }
                syslog(LOG_ERR, "connect: %m");
                exit(1);
        }

diff --git a/usr/src/old/init/init.c b/usr/src/old/init/init.c
index 355113f..7777256 100644 (file)
--- a/usr/src/old/init/init.c
+++ b/usr/src/old/init/init.c
@@ -5,7 +5,7 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)init.c     5.4 (Berkeley) %G%";
+static char sccsid[] = "@(#)init.c     5.5 (Berkeley) %G%";

 #endif not lint
 
 #include <signal.h>
 #endif not lint
 
 #include <signal.h>


@@ -95,7 +95,7 @@ main(argc, argv)
                howto = RB_SINGLE;
        }
 #endif
                howto = RB_SINGLE;
        }
 #endif

-       openlog("init", LOG_CONS|LOG_ODELAY, 0);
+       openlog("init", LOG_CONS|LOG_ODELAY, LOG_AUTH);

        sigvec(SIGTERM, &rvec, (struct sigvec *)0);
        signal(SIGTSTP, idle);
        signal(SIGSTOP, SIG_IGN);
        sigvec(SIGTERM, &rvec, (struct sigvec *)0);
        signal(SIGTSTP, idle);
        signal(SIGSTOP, SIG_IGN);

diff --git a/usr/src/sbin/init/init.c b/usr/src/sbin/init/init.c
index 355113f..7777256 100644 (file)
--- a/usr/src/sbin/init/init.c
+++ b/usr/src/sbin/init/init.c
@@ -5,7 +5,7 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)init.c     5.4 (Berkeley) %G%";
+static char sccsid[] = "@(#)init.c     5.5 (Berkeley) %G%";

 #endif not lint
 
 #include <signal.h>
 #endif not lint
 
 #include <signal.h>


@@ -95,7 +95,7 @@ main(argc, argv)
                howto = RB_SINGLE;
        }
 #endif
                howto = RB_SINGLE;
        }
 #endif

-       openlog("init", LOG_CONS|LOG_ODELAY, 0);
+       openlog("init", LOG_CONS|LOG_ODELAY, LOG_AUTH);

        sigvec(SIGTERM, &rvec, (struct sigvec *)0);
        signal(SIGTSTP, idle);
        signal(SIGSTOP, SIG_IGN);
        sigvec(SIGTERM, &rvec, (struct sigvec *)0);
        signal(SIGTSTP, idle);
        signal(SIGSTOP, SIG_IGN);

diff --git a/usr/src/sys/vax/uba/up.c b/usr/src/sys/vax/uba/up.c
index 8ece058..c8308a9 100644 (file)
--- a/usr/src/sys/vax/uba/up.c
+++ b/usr/src/sys/vax/uba/up.c
@@ -3,7 +3,7 @@
  * All rights reserved.  The Berkeley software License Agreement
  * specifies the terms and conditions for redistribution.
  *
  * All rights reserved.  The Berkeley software License Agreement
  * specifies the terms and conditions for redistribution.
  *

- *     @(#)up.c        6.8 (Berkeley) %G%
+ *     @(#)up.c        6.9 (Berkeley) %G%

  */
 
 #include "up.h"
  */
 
 #include "up.h"

diff --git a/usr/src/usr.bin/login/login.c b/usr/src/usr.bin/login/login.c
index c8ba5a6..ab816dd 100644 (file)
--- a/usr/src/usr.bin/login/login.c
+++ b/usr/src/usr.bin/login/login.c
@@ -11,7 +11,7 @@ char copyright[] =
 #endif not lint
 
 #ifndef lint
 #endif not lint
 
 #ifndef lint

-static char sccsid[] = "@(#)login.c    5.4 (Berkeley) %G%";
+static char sccsid[] = "@(#)login.c    5.5 (Berkeley) %G%";

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


@@ -168,7 +168,7 @@ main(argc, argv)
                tty = ttyn;
        else
                tty++;
                tty = ttyn;
        else
                tty++;

-       openlog("login", LOG_ODELAY, 0);
+       openlog("login", LOG_ODELAY, LOG_AUTH);

        t = 0;
        do {
                ldisc = 0;
        t = 0;
        do {
                ldisc = 0;


@@ -226,13 +226,13 @@ main(argc, argv)
                 * see if root logins on this terminal are permitted.
                 */
                if (!invalid && pwd->pw_uid == 0 && !rootterm(tty)) {
                 * see if root logins on this terminal are permitted.
                 */
                if (!invalid && pwd->pw_uid == 0 && !rootterm(tty)) {

-                       syslog(LOG_SECURITY, "ROOT LOGIN REFUSED %s", tty);
+                       syslog(LOG_CRIT, "ROOT LOGIN REFUSED %s", tty);

                        invalid = TRUE;
                }
                if (invalid) {
                        printf("Login incorrect\n");
                        if (++t >= 5) {
                        invalid = TRUE;
                }
                if (invalid) {
                        printf("Login incorrect\n");
                        if (++t >= 5) {

-                               syslog(LOG_SECURITY,
+                               syslog(LOG_CRIT,

                                    "REPEATED LOGIN FAILURES %s, %s",
                                        tty, utmp.ut_name);
                                ioctl(0, TIOCHPCL, (struct sgttyb *) 0);
                                    "REPEATED LOGIN FAILURES %s, %s",
                                        tty, utmp.ut_name);
                                ioctl(0, TIOCHPCL, (struct sgttyb *) 0);


@@ -350,7 +350,7 @@ main(argc, argv)
        if (tty[sizeof("tty")-1] == 'd')
                syslog(LOG_INFO, "DIALUP %s, %s", tty, pwd->pw_name);
        if (pwd->pw_uid == 0)
        if (tty[sizeof("tty")-1] == 'd')
                syslog(LOG_INFO, "DIALUP %s, %s", tty, pwd->pw_name);
        if (pwd->pw_uid == 0)

-               syslog(LOG_SECURITY, "ROOT LOGIN %s", tty);
+               syslog(LOG_NOTICE, "ROOT LOGIN %s", tty);

        if (!quietlog) {
                struct stat st;
 
        if (!quietlog) {
                struct stat st;
 

diff --git a/usr/src/usr.bin/login/login.c.1 b/usr/src/usr.bin/login/login.c.1
index b077ee0..a8e9e30 100644 (file)
--- a/usr/src/usr.bin/login/login.c.1
+++ b/usr/src/usr.bin/login/login.c.1
@@ -11,7 +11,7 @@ char copyright[] =
 #endif not lint
 
 #ifndef lint
 #endif not lint
 
 #ifndef lint

-static char sccsid[] = "@(#)login.c.1  5.4 (Berkeley) %G%";
+static char sccsid[] = "@(#)login.c.1  5.5 (Berkeley) %G%";

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


@@ -168,7 +168,7 @@ main(argc, argv)
                tty = ttyn;
        else
                tty++;
                tty = ttyn;
        else
                tty++;

-       openlog("login", LOG_ODELAY, 0);
+       openlog("login", LOG_ODELAY, LOG_AUTH);

        t = 0;
        do {
                ldisc = 0;
        t = 0;
        do {
                ldisc = 0;


@@ -226,13 +226,13 @@ main(argc, argv)
                 * see if root logins on this terminal are permitted.
                 */
                if (!invalid && pwd->pw_uid == 0 && !rootterm(tty)) {
                 * see if root logins on this terminal are permitted.
                 */
                if (!invalid && pwd->pw_uid == 0 && !rootterm(tty)) {

-                       syslog(LOG_SECURITY, "ROOT LOGIN REFUSED %s", tty);
+                       syslog(LOG_CRIT, "ROOT LOGIN REFUSED %s", tty);

                        invalid = TRUE;
                }
                if (invalid) {
                        printf("Login incorrect\n");
                        if (++t >= 5) {
                        invalid = TRUE;
                }
                if (invalid) {
                        printf("Login incorrect\n");
                        if (++t >= 5) {

-                               syslog(LOG_SECURITY,
+                               syslog(LOG_CRIT,

                                    "REPEATED LOGIN FAILURES %s, %s",
                                        tty, utmp.ut_name);
                                ioctl(0, TIOCHPCL, (struct sgttyb *) 0);
                                    "REPEATED LOGIN FAILURES %s, %s",
                                        tty, utmp.ut_name);
                                ioctl(0, TIOCHPCL, (struct sgttyb *) 0);


@@ -350,7 +350,7 @@ main(argc, argv)
        if (tty[sizeof("tty")-1] == 'd')
                syslog(LOG_INFO, "DIALUP %s, %s", tty, pwd->pw_name);
        if (pwd->pw_uid == 0)
        if (tty[sizeof("tty")-1] == 'd')
                syslog(LOG_INFO, "DIALUP %s, %s", tty, pwd->pw_name);
        if (pwd->pw_uid == 0)

-               syslog(LOG_SECURITY, "ROOT LOGIN %s", tty);
+               syslog(LOG_NOTICE, "ROOT LOGIN %s", tty);

        if (!quietlog) {
                struct stat st;
 
        if (!quietlog) {
                struct stat st;
 

diff --git a/usr/src/usr.sbin/inetd/inetd.c b/usr/src/usr.sbin/inetd/inetd.c
index bb350fa..32a5428 100644 (file)
--- a/usr/src/usr.sbin/inetd/inetd.c
+++ b/usr/src/usr.sbin/inetd/inetd.c
@@ -11,7 +11,7 @@ char copyright[] =
 #endif not lint
 
 #ifndef lint
 #endif not lint
 
 #ifndef lint

-static char sccsid[] = "@(#)inetd.c    5.1 (Berkeley) %G%";
+static char sccsid[] = "@(#)inetd.c    5.2 (Berkeley) %G%";

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


@@ -140,7 +140,7 @@ nextopt:
          }
        }
 #endif
          }
        }
 #endif

-       openlog("inetd", LOG_PID, 0);
+       openlog("inetd", LOG_PID, LOG_DAEMON);

        config();
        signal(SIGHUP, config);
        signal(SIGCHLD, reapchild);
        config();
        signal(SIGHUP, config);
        signal(SIGCHLD, reapchild);

diff --git a/usr/src/usr.sbin/lpr/lpd/lpd.c b/usr/src/usr.sbin/lpr/lpd/lpd.c
index 9ded3a1..26f771a 100644 (file)
--- a/usr/src/usr.sbin/lpr/lpd/lpd.c
+++ b/usr/src/usr.sbin/lpr/lpd/lpd.c
@@ -11,7 +11,7 @@ char copyright[] =
 #endif not lint
 
 #ifndef lint
 #endif not lint
 
 #ifndef lint

-static char sccsid[] = "@(#)lpd.c      5.1 (Berkeley) %G%";
+static char sccsid[] = "@(#)lpd.c      5.2 (Berkeley) %G%";

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


@@ -93,7 +93,7 @@ main(argc, argv)
        }
 #endif
 
        }
 #endif
 

-       openlog("lpd", LOG_PID, 0);
+       openlog("lpd", LOG_PID, LOG_DAEMON);

        (void) umask(0);
        lfd = open(MASTERLOCK, O_WRONLY|O_CREAT, 0644);
        if (lfd < 0) {
        (void) umask(0);
        lfd = open(MASTERLOCK, O_WRONLY|O_CREAT, 0644);
        if (lfd < 0) {

diff --git a/usr/src/usr.sbin/lpr/lpd/printjob.c b/usr/src/usr.sbin/lpr/lpd/printjob.c
index d953c88..c96073f 100644 (file)
--- a/usr/src/usr.sbin/lpr/lpd/printjob.c
+++ b/usr/src/usr.sbin/lpr/lpd/printjob.c
@@ -5,7 +5,7 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)printjob.c 5.1 (Berkeley) %G%";
+static char sccsid[] = "@(#)printjob.c 5.2 (Berkeley) %G%";

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


@@ -727,7 +727,7 @@ sendfile(type, file)
                if (i == 0)
                        status("no space on remote; waiting for queue to drain");
                if (i == 10)
                if (i == 0)
                        status("no space on remote; waiting for queue to drain");
                if (i == 10)

-                       syslog(LOG_SALERT, "%s: can't send to %s; queue full",
+                       syslog(LOG_ALERT, "%s: can't send to %s; queue full",

                                printer, RM);
                sleep(5 * 60);
        }
                                printer, RM);
                sleep(5 * 60);
        }

diff --git a/usr/src/usr.sbin/rwhod/rwhod.c b/usr/src/usr.sbin/rwhod/rwhod.c
index 80cb732..dfa029a 100644 (file)
--- a/usr/src/usr.sbin/rwhod/rwhod.c
+++ b/usr/src/usr.sbin/rwhod/rwhod.c
@@ -11,7 +11,7 @@ char copyright[] =
 #endif not lint
 
 #ifndef lint
 #endif not lint
 
 #ifndef lint

-static char sccsid[] = "@(#)rwhod.c    5.4 (Berkeley) %G%";
+static char sccsid[] = "@(#)rwhod.c    5.5 (Berkeley) %G%";

 #endif not lint
 
 #include <sys/types.h>
 #endif not lint
 
 #include <sys/types.h>


@@ -117,7 +117,7 @@ main()
 #endif
        (void) chdir("/dev");
        (void) signal(SIGHUP, getkmem);
 #endif
        (void) chdir("/dev");
        (void) signal(SIGHUP, getkmem);

-       openlog("rwhod", LOG_PID, 0);
+       openlog("rwhod", LOG_PID, LOG_DAEMON);

        /*
         * Establish host name as returned by system.
         */
        /*
         * Establish host name as returned by system.
         */

diff --git a/usr/src/usr.sbin/sendmail/src/daemon.c b/usr/src/usr.sbin/sendmail/src/daemon.c
index bb2bf35..4dce878 100644 (file)
--- a/usr/src/usr.sbin/sendmail/src/daemon.c
+++ b/usr/src/usr.sbin/sendmail/src/daemon.c
@@ -15,7 +15,7 @@
 
 # ifndef DAEMON
 # ifndef lint
 
 # ifndef DAEMON
 # ifndef lint

-static char    SccsId[] = "@(#)daemon.c        5.6 (Berkeley) %G%      (w/o daemon mode)";
+static char    SccsId[] = "@(#)daemon.c        5.7 (Berkeley) %G%      (w/o daemon mode)";

 # endif not lint
 # else
 
 # endif not lint
 # else
 


@@ -27,7 +27,7 @@ static char   SccsId[] = "@(#)daemon.c        5.6 (Berkeley) %G%      (w/o daemon mode)";
 # include <sys/resource.h>
 
 # ifndef lint
 # include <sys/resource.h>
 
 # ifndef lint

-static char    SccsId[] = "@(#)daemon.c        5.6 (Berkeley) %G% (with daemon mode)";
+static char    SccsId[] = "@(#)daemon.c        5.7 (Berkeley) %G% (with daemon mode)";

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


@@ -122,7 +122,7 @@ getrequests()
          severe:
 # ifdef LOG
                if (LogLevel > 0)
          severe:
 # ifdef LOG
                if (LogLevel > 0)

-                       syslog(LOG_SALERT, "cannot get connection");
+                       syslog(LOG_ALERT, "cannot get connection");

 # endif LOG
                finis();
        }
 # endif LOG
                finis();
        }

diff --git a/usr/src/usr.sbin/sendmail/src/err.c b/usr/src/usr.sbin/sendmail/src/err.c
index 27bdab8..a5836dd 100644 (file)
--- a/usr/src/usr.sbin/sendmail/src/err.c
+++ b/usr/src/usr.sbin/sendmail/src/err.c
@@ -9,7 +9,7 @@
 */
 
 #ifndef lint
 */
 
 #ifndef lint

-static char    SccsId[] = "@(#)err.c   5.2 (Berkeley) %G%";
+static char    SccsId[] = "@(#)err.c   5.3 (Berkeley) %G%";

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


@@ -69,7 +69,7 @@ syserr(fmt, a, b, c, d, e)
        (void) queuename(CurEnv, '\0');
 # ifdef LOG
        if (LogLevel > 0)
        (void) queuename(CurEnv, '\0');
 # ifdef LOG
        if (LogLevel > 0)

-               syslog(LOG_MAIL, "%s: SYSERR: %s", CurEnv->e_id, &MsgBuf[4]);
+               syslog(LOG_CRIT, "%s: SYSERR: %s", CurEnv->e_id, &MsgBuf[4]);

 # endif LOG
        errno = 0;
        if (QuickAbort)
 # endif LOG
        errno = 0;
        if (QuickAbort)

diff --git a/usr/src/usr.sbin/sendmail/src/main.c b/usr/src/usr.sbin/sendmail/src/main.c
index 17fab4e..8ca2365 100644 (file)
--- a/usr/src/usr.sbin/sendmail/src/main.c
+++ b/usr/src/usr.sbin/sendmail/src/main.c
@@ -15,7 +15,7 @@ char copyright[] =
 #endif not lint
 
 #ifndef lint
 #endif not lint
 
 #ifndef lint

-static char    SccsId[] = "@(#)main.c  5.4 (Berkeley) %G%";
+static char    SccsId[] = "@(#)main.c  5.5 (Berkeley) %G%";

 #endif not lint
 
 # define  _DEFINE
 #endif not lint
 
 # define  _DEFINE


@@ -184,7 +184,7 @@ main(argc, argv, envp)
 # endif V6
 
 # ifdef LOG
 # endif V6
 
 # ifdef LOG

-       openlog("sendmail", LOG_PID, 0);
+       openlog("sendmail", LOG_PID, LOG_MAIL);

 # endif LOG
        errno = 0;
        from = NULL;
 # endif LOG
        errno = 0;
        from = NULL;

diff --git a/usr/src/usr.sbin/sendmail/src/usersmtp.c b/usr/src/usr.sbin/sendmail/src/usersmtp.c
index 8ec2811..2e63381 100644 (file)
--- a/usr/src/usr.sbin/sendmail/src/usersmtp.c
+++ b/usr/src/usr.sbin/sendmail/src/usersmtp.c
@@ -16,12 +16,12 @@
 
 # ifndef SMTP
 # ifndef lint
 
 # ifndef SMTP
 # ifndef lint

-static char    SccsId[] = "@(#)usersmtp.c      5.3 (Berkeley) %G%      (no SMTP)";
+static char    SccsId[] = "@(#)usersmtp.c      5.4 (Berkeley) %G%      (no SMTP)";

 # endif not lint
 # else SMTP
 
 # ifndef lint
 # endif not lint
 # else SMTP
 
 # ifndef lint

-static char    SccsId[] = "@(#)usersmtp.c      5.3 (Berkeley) %G%";
+static char    SccsId[] = "@(#)usersmtp.c      5.4 (Berkeley) %G%";

 # endif not lint
 
 
 # endif not lint
 
 


@@ -419,7 +419,7 @@ reply(m)
                                pause();
 # endif DEBUG
 # ifdef LOG
                                pause();
 # endif DEBUG
 # ifdef LOG

-                       syslog(LOG_MAIL, "%s", &MsgBuf[4]);
+                       syslog(LOG_ERR, "%s", &MsgBuf[4]);

 # endif LOG
                        SmtpState = SMTP_CLOSED;
                        smtpquit(m);
 # endif LOG
                        SmtpState = SMTP_CLOSED;
                        smtpquit(m);

diff --git a/usr/src/usr.sbin/sendmail/src/version.c b/usr/src/usr.sbin/sendmail/src/version.c
index e9df0e1..5bb9bab 100644 (file)
--- a/usr/src/usr.sbin/sendmail/src/version.c
+++ b/usr/src/usr.sbin/sendmail/src/version.c
@@ -9,7 +9,7 @@
 */
 
 #ifndef lint
 */
 
 #ifndef lint

-static char    SccsId[] = "@(#)version.c       5.7 (Berkeley) %G%";
+static char    SccsId[] = "@(#)version.c       5.8 (Berkeley) %G%";

 #endif not lint
 
 #endif not lint
 

-char   Version[] = "5.7";
+char   Version[] = "5.8";