diff options
| author | Christian Weisgerber <naddy@cvs.openbsd.org> | 2008-06-10 03:46:10 +0000 |
|---|---|---|
| committer | Christian Weisgerber <naddy@cvs.openbsd.org> | 2008-06-10 03:46:10 +0000 |
| commit | 2cfc51272e42f900535e789491b04ac34dd5125f (patch) | |
| tree | 035f7d6d1d293e2d12ea7768ebad4d76f432a8bc /usr.sbin/ntpd/server.c | |
| parent | feaa668f73c2ceb6477df152becd63debd7d1edc (diff) | |
According to the latest SNTPv4 spec in RFC4330, secondary servers
return the address of the synchronization source as reference
identification. Remove the obsolete special casing specified in RFC2030.
ok henning@
Diffstat (limited to 'usr.sbin/ntpd/server.c')
| -rw-r--r-- | usr.sbin/ntpd/server.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/usr.sbin/ntpd/server.c b/usr.sbin/ntpd/server.c index 3429aa011b5..6156d522914 100644 --- a/usr.sbin/ntpd/server.c +++ b/usr.sbin/ntpd/server.c @@ -1,4 +1,4 @@ -/* $OpenBSD: server.c,v 1.31 2007/01/15 08:19:11 otto Exp $ */ +/* $OpenBSD: server.c,v 1.32 2008/06/10 03:46:09 naddy Exp $ */ /* * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org> @@ -162,11 +162,7 @@ server_dispatch(int fd, struct ntpd_conf *lconf) reply.xmttime = d_to_lfp(gettime_corrected()); reply.orgtime = query.xmttime; reply.rootdelay = d_to_sfp(lconf->status.rootdelay); - - if (version > 3) - reply.refid = lconf->status.refid4; - else - reply.refid = lconf->status.refid; + reply.refid = lconf->status.refid; ntp_sendmsg(fd, (struct sockaddr *)&fsa, &reply, size, 0); return (0); |