more environment problems; limit resource exhaustion; fix incorrect

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

diff --git a/usr/src/usr.sbin/sendmail/src/queue.c b/usr/src/usr.sbin/sendmail/src/queue.c
index cddbd3c..90697b2 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.4 (Berkeley) %G% (with queueing)";
+static char sccsid[] = "@(#)queue.c    6.5 (Berkeley) %G% (with queueing)";

 #else
 #else

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

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


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

+               extern bool shouldqueue();

 
                /* is this an interesting entry? */
                if (d->d_ino == 0)
 
                /* is this an interesting entry? */
                if (d->d_ino == 0)


@@ -758,7 +759,7 @@ dowork(w, e)
                }
 
                e->e_flags |= EF_INQUEUE;
                }
 
                e->e_flags |= EF_INQUEUE;

-               eatheader(e);
+               eatheader(e, TRUE);

 
                /* do the delivery */
                if (!bitset(EF_FATALERRS, e->e_flags))
 
                /* do the delivery */
                if (!bitset(EF_FATALERRS, e->e_flags))


@@ -1274,16 +1275,15 @@ setctluser(user)
                a->q_home = newstr(pw->pw_dir);
                a->q_uid = pw->pw_uid;
                a->q_gid = pw->pw_gid;
                a->q_home = newstr(pw->pw_dir);
                a->q_uid = pw->pw_uid;
                a->q_gid = pw->pw_gid;

-               a->q_ruser = newstr(user);
+               a->q_user = newstr(user);

        }
        else
        {
                a->q_uid = DefUid;
                a->q_gid = DefGid;
        }
        else
        {
                a->q_uid = DefUid;
                a->q_gid = DefGid;

-               a->q_ruser = newstr(DefUser);
+               a->q_user = newstr(DefUser);

        }
 
        }
 

-       a->q_user = a->q_ruser;

        a->q_flags |= QGOODUID;         /* flag as a "ctladdr"  */
        a->q_mailer = LocalMailer;
        return a;
        a->q_flags |= QGOODUID;         /* flag as a "ctladdr"  */
        a->q_mailer = LocalMailer;
        return a;