tested wrong thing to decide if new or old sockaddrs; just do new.

SCCS-vsn: usr.sbin/timed/timed/timed.c 2.19

diff --git a/usr/src/usr.sbin/timed/timed/timed.c b/usr/src/usr.sbin/timed/timed/timed.c
index 6f9563f..739752f 100644 (file)
--- a/usr/src/usr.sbin/timed/timed/timed.c
+++ b/usr/src/usr.sbin/timed/timed/timed.c
@@ -12,7 +12,7 @@ char copyright[] =
 #endif /* not lint */
 
 #ifndef lint
 #endif /* not lint */
 
 #ifndef lint

-static char sccsid[] = "@(#)timed.c    2.18 (Berkeley) %G%";
+static char sccsid[] = "@(#)timed.c    2.19 (Berkeley) %G%";

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


@@ -226,12 +226,8 @@ char **argv;
                exit(1);
        }
        ntp = NULL;
                exit(1);
        }
        ntp = NULL;

-#ifdef RTM_ADD

 #define max(a, b) (a > b ? a : b)
 #define size(p)        max((p).sa_len, sizeof(p))
 #define max(a, b) (a > b ? a : b)
 #define size(p)        max((p).sa_len, sizeof(p))

-#else
-#define size(p) (sizeof (p))
-#endif

        cplim = buf + ifc.ifc_len; /*skip over if's with big ifr_addr's */
        for (cp = buf; cp < cplim;
                        cp += sizeof (ifr->ifr_name) + size(ifr->ifr_addr)) {
        cplim = buf + ifc.ifc_len; /*skip over if's with big ifr_addr's */
        for (cp = buf; cp < cplim;
                        cp += sizeof (ifr->ifr_name) + size(ifr->ifr_addr)) {