fix alignment problems on 68K & pyramid boxes caused by -ldbm

SCCS-vsn: usr.bin/vacation/vacation.c 5.3

diff --git a/usr/src/usr.bin/vacation/vacation.c b/usr/src/usr.bin/vacation/vacation.c
index 424b250..87012b5 100644 (file)
--- a/usr/src/usr.bin/vacation/vacation.c
+++ b/usr/src/usr.bin/vacation/vacation.c
@@ -9,7 +9,7 @@
 */
 
 #ifndef lint
 */
 
 #ifndef lint

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

 #endif not lint
 
 # include <sys/types.h>
 #endif not lint
 
 # include <sys/types.h>


@@ -278,12 +278,18 @@ knows(user)
 {
        DATUM k, d;
        long now;
 {
        DATUM k, d;
        long now;

+       auto long then;

 
        time(&now);
        k.dptr = user;
        k.dsize = strlen(user) + 1;
        d = fetch(k);
 
        time(&now);
        k.dptr = user;
        k.dsize = strlen(user) + 1;
        d = fetch(k);

-       if (d.dptr == NULL || ((struct dbrec *) d.dptr)->sentdate + Timeout < now)
+       if (d.dptr == NULL)
+               return (FALSE);
+       
+       /* be careful on 68k's and others with alignment restrictions */
+       bcopy((char *) &((struct dbrec *) d.dptr)->sentdate, (char *) &then, sizeof then);
+       if (then + Timeout < now)

                return (FALSE);
        return (TRUE);
 }
                return (FALSE);
        return (TRUE);
 }