4.4BSD snapshot (revision 8.1); add 1993 to copyright

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

diff --git a/usr/src/usr.sbin/sendmail/src/recipient.c b/usr/src/usr.sbin/sendmail/src/recipient.c
index 8f24be9..39f6938 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        8.1 (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)


@@ -328,7 +325,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 +383,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));