fix overzealous removal of df file

SCCS-vsn: usr.sbin/sendmail/src/envelope.c 5.3
SCCS-vsn: usr.sbin/sendmail/src/version.c 5.3

diff --git a/usr/src/usr.sbin/sendmail/src/envelope.c b/usr/src/usr.sbin/sendmail/src/envelope.c
index 4e4fe7c..ff2b5f2 100644 (file)
--- a/usr/src/usr.sbin/sendmail/src/envelope.c
+++ b/usr/src/usr.sbin/sendmail/src/envelope.c
@@ -9,7 +9,7 @@
 */
 
 #ifndef lint
 */
 
 #ifndef lint

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

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


@@ -142,6 +142,8 @@ dropenvelope(e)
        {
                if (e->e_dfp != NULL)
                        (void) fclose(e->e_dfp);
        {
                if (e->e_dfp != NULL)
                        (void) fclose(e->e_dfp);

+               if (e->e_df != NULL)
+                       xunlink(e->e_df);

                xunlink(queuename(e, 'q'));
        }
        else if (queueit || !bitset(EF_INQUEUE, e->e_flags))
                xunlink(queuename(e, 'q'));
        }
        else if (queueit || !bitset(EF_INQUEUE, e->e_flags))


@@ -158,8 +160,6 @@ dropenvelope(e)
        unlockqueue(e);
 
        /* make sure that this envelope is marked unused */
        unlockqueue(e);
 
        /* make sure that this envelope is marked unused */

-       if (e->e_df != NULL)
-               xunlink(e->e_df);

        e->e_id = e->e_df = NULL;
        e->e_dfp = NULL;
 }
        e->e_id = e->e_df = NULL;
        e->e_dfp = NULL;
 }

diff --git a/usr/src/usr.sbin/sendmail/src/version.c b/usr/src/usr.sbin/sendmail/src/version.c
index c053fd3..918d1de 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.2 (Berkeley) %G%";
+static char    SccsId[] = "@(#)version.c       5.3 (Berkeley) %G%";

 #endif not lint
 
 #endif not lint
 

-char   Version[] = "5.2";
+char   Version[] = "5.3";