don't use %e for syslog errors -- either %m or errstring

SCCS-vsn: usr.sbin/sendmail/src/recipient.c 6.40
SCCS-vsn: usr.sbin/sendmail/src/alias.c 6.38
SCCS-vsn: usr.sbin/sendmail/src/udb.c 6.19

diff --git a/usr/src/usr.sbin/sendmail/src/alias.c b/usr/src/usr.sbin/sendmail/src/alias.c
index fa6d0d5..fd04b43 100644 (file)
--- a/usr/src/usr.sbin/sendmail/src/alias.c
+++ b/usr/src/usr.sbin/sendmail/src/alias.c
@@ -25,15 +25,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.37 (Berkeley) %G% (with NEWDB and NDBM)";
+static char sccsid[] = "@(#)alias.c    6.38 (Berkeley) %G% (with NEWDB and NDBM)";

 #else
 #else

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

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

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

 #else
 #else

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

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


@@ -959,8 +959,8 @@ 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_ERR, "%s: forward %s: transient error: %e",
-                                       e->e_id, buf);
+                               syslog(LOG_ERR, "%s: forward %s: transient error: %s",
+                                       e->e_id, buf, errstring(err));

 #endif
                        message("%s: %s: message queued", buf, errstring(err));
                        user->q_flags |= QQUEUEUP|QDONTSEND;
 #endif
                        message("%s: %s: message queued", buf, errstring(err));
                        user->q_flags |= QQUEUEUP|QDONTSEND;

diff --git a/usr/src/usr.sbin/sendmail/src/recipient.c b/usr/src/usr.sbin/sendmail/src/recipient.c
index 8f24be9..55f7bc9 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.39 (Berkeley) %G%";
+static char sccsid[] = "@(#)recipient.c        6.40 (Berkeley) %G%";

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


@@ -328,7 +328,7 @@ recipient(a, sendq, e)
 #ifdef LOG
                                if (LogLevel > 2)
                                        syslog(LOG_ERR, "%s: include %s: transient error: %e",
 #ifdef LOG
                                if (LogLevel > 2)
                                        syslog(LOG_ERR, "%s: include %s: transient error: %e",

-                                               e->e_id, a->q_user);
+                                               e->e_id, a->q_user, errstring(ret));

 #endif
                                a->q_flags |= QQUEUEUP|QDONTSEND;
                                usrerr("451 Cannot open %s: %s",
 #endif
                                a->q_flags |= QQUEUEUP|QDONTSEND;
                                usrerr("451 Cannot open %s: %s",


@@ -386,8 +386,8 @@ recipient(a, sendq, e)
                                e->e_message = newstr("Deferred: user database error");
 # ifdef LOG
                        if (LogLevel > 8)
                                e->e_message = newstr("Deferred: user database error");
 # ifdef LOG
                        if (LogLevel > 8)

-                               syslog(LOG_INFO, "%s: deferred: udbexpand: %e",
-                                       e->e_id);
+                               syslog(LOG_INFO, "%s: deferred: udbexpand: %s",
+                                       e->e_id, errstring(errno));

 # endif
                        message("queued (user database error): %s",
                                errstring(errno));
 # endif
                        message("queued (user database error): %s",
                                errstring(errno));

diff --git a/usr/src/usr.sbin/sendmail/src/udb.c b/usr/src/usr.sbin/sendmail/src/udb.c
index 1bcd9e3..0e0e5aa 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.18 (Berkeley) %G% (with USERDB)";
+static char sccsid [] = "@(#)udb.c     6.19 (Berkeley) %G% (with USERDB)";

 #else
 #else

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

 #endif
 #endif
 
 #endif
 #endif
 


@@ -563,8 +563,8 @@ _udbx_init()
                                {
 #ifdef LOG
                                        if (LogLevel > 2)
                                {
 #ifdef LOG
                                        if (LogLevel > 2)

-                                               syslog(LOG_ERR, "dbopen(%s): %e",
-                                                       spec);
+                                               syslog(LOG_ERR, "dbopen(%s): %s",
+                                                       spec, errstring(errno));

 #endif
                                        up->udb_type = UDB_EOLIST;
                                        goto tempfail;
 #endif
                                        up->udb_type = UDB_EOLIST;
                                        goto tempfail;