minor tweaking of syslog levels & compile fixes for SunOS & Ultrix

[unix-history] / usr / src / usr.sbin / sendmail / src / alias.c

diff --git a/usr/src/usr.sbin/sendmail/src/alias.c b/usr/src/usr.sbin/sendmail/src/alias.c
index 8b1af9d..f07e734 100644 (file)
--- a/usr/src/usr.sbin/sendmail/src/alias.c
+++ b/usr/src/usr.sbin/sendmail/src/alias.c
@@ -15,6 +15,7 @@ ERROR: DBM is no longer supported -- use NDBM instead.
 # endif
 
 # ifdef NEWDB
 # endif
 
 # ifdef NEWDB

+# undef __P

 # include <db.h>
 # endif
 
 # include <db.h>
 # endif
 


@@ -25,15 +26,15 @@ ERROR: DBM is no longer supported -- use NDBM instead.
 #ifndef lint
 #ifdef NEWDB
 #ifdef NDBM
 #ifndef lint
 #ifdef NEWDB
 #ifdef NDBM

-static char sccsid[] = "@(#)alias.c    6.35 (Berkeley) %G% (with NEWDB and NDBM)";
+static char sccsid[] = "@(#)alias.c    6.36 (Berkeley) %G% (with NEWDB and NDBM)";

 #else
 #else

-static char sccsid[] = "@(#)alias.c    6.35 (Berkeley) %G% (with NEWDB)";
+static char sccsid[] = "@(#)alias.c    6.36 (Berkeley) %G% (with NEWDB)";

 #endif
 #else
 #ifdef NDBM
 #endif
 #else
 #ifdef NDBM

-static char sccsid[] = "@(#)alias.c    6.35 (Berkeley) %G% (with NDBM)";
+static char sccsid[] = "@(#)alias.c    6.36 (Berkeley) %G% (with NDBM)";

 #else
 #else

-static char sccsid[] = "@(#)alias.c    6.35 (Berkeley) %G% (without NEWDB or NDBM)";
+static char sccsid[] = "@(#)alias.c    6.36 (Berkeley) %G% (without NEWDB or NDBM)";

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


@@ -959,7 +960,7 @@ forward(user, sendq, e)
                                printf("forward: transient error on %s\n", buf);
 #ifdef LOG
                        if (LogLevel > 2)
                                printf("forward: transient error on %s\n", buf);
 #ifdef LOG
                        if (LogLevel > 2)

-                               syslog(LOG_NOTICE, "%s: forward %s: transient error: %e",
+                               syslog(LOG_ERR, "%s: forward %s: transient error: %e",

                                        e->e_id, buf);
 #endif
                        message("%s: %s: message queued", buf, errstring(err));
                                        e->e_id, buf);
 #endif
                        message("%s: %s: message queued", buf, errstring(err));