From 27f85bb7b73ee3e50966d9d62279cb125c8ed48c Mon Sep 17 00:00:00 2001
From: mglocker <>
Date: Tue, 30 Apr 2013 11:42:56 +0000
Subject: [PATCH] Remove unused function argument variables 'len' and 'auth'
 from ntp_sendmsg().  They have been removed from the function body in the
 past but not from the argument list.

From Maxime Villard
---
 src/usr.sbin/ntpd/client.c  | 5 ++---
 src/usr.sbin/ntpd/ntp_msg.c | 5 ++---
 src/usr.sbin/ntpd/ntpd.h    | 4 ++--
 src/usr.sbin/ntpd/server.c  | 4 ++--
 4 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/src/usr.sbin/ntpd/client.c b/src/usr.sbin/ntpd/client.c
index c6f20a25..0b59427b 100644
--- a/src/usr.sbin/ntpd/client.c
+++ b/src/usr.sbin/ntpd/client.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: client.c,v 1.89 2011/09/21 15:41:30 phessler Exp $ */
+/*	$OpenBSD: client.c,v 1.90 2013/04/30 11:42:56 mglocker Exp $ */
 
 /*
  * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org>
@@ -186,8 +186,7 @@ client_query(struct ntp_peer *p)
 	p->query->msg.xmttime.fractionl = arc4random();
 	p->query->xmttime = gettime_corrected();
 
-	if (ntp_sendmsg(p->query->fd, NULL, &p->query->msg,
-	    NTP_MSGSIZE_NOAUTH, 0) == -1) {
+	if (ntp_sendmsg(p->query->fd, NULL, &p->query->msg) == -1) {
 		p->senderrors++;
 		set_next(p, INTERVAL_QUERY_PATHETIC);
 		p->trustlevel = TRUSTLEVEL_PATHETIC;
diff --git a/src/usr.sbin/ntpd/ntp_msg.c b/src/usr.sbin/ntpd/ntp_msg.c
index 354b89b2..15920417 100644
--- a/src/usr.sbin/ntpd/ntp_msg.c
+++ b/src/usr.sbin/ntpd/ntp_msg.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ntp_msg.c,v 1.18 2007/10/19 15:53:57 otto Exp $ */
+/*	$OpenBSD: ntp_msg.c,v 1.19 2013/04/30 11:42:56 mglocker Exp $ */
 
 /*
  * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org>
@@ -40,8 +40,7 @@ ntp_getmsg(struct sockaddr *sa, char *p, ssize_t len, struct ntp_msg *msg)
 }
 
 int
-ntp_sendmsg(int fd, struct sockaddr *sa, struct ntp_msg *msg, ssize_t len,
-    int auth)
+ntp_sendmsg(int fd, struct sockaddr *sa, struct ntp_msg *msg)
 {
 	socklen_t	sa_len;
 	ssize_t		n;
diff --git a/src/usr.sbin/ntpd/ntpd.h b/src/usr.sbin/ntpd/ntpd.h
index 80ac7404..5cce7dd0 100644
--- a/src/usr.sbin/ntpd/ntpd.h
+++ b/src/usr.sbin/ntpd/ntpd.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ntpd.h,v 1.106 2012/09/20 12:43:16 patrick Exp $ */
+/*	$OpenBSD: ntpd.h,v 1.107 2013/04/30 11:42:56 mglocker Exp $ */
 
 /*
  * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org>
@@ -226,7 +226,7 @@ struct ntp_conf_sensor	*new_sensor(char *);
 
 /* ntp_msg.c */
 int	ntp_getmsg(struct sockaddr *, char *, ssize_t, struct ntp_msg *);
-int	ntp_sendmsg(int, struct sockaddr *, struct ntp_msg *, ssize_t, int);
+int	ntp_sendmsg(int, struct sockaddr *, struct ntp_msg *);
 
 /* server.c */
 int	setup_listeners(struct servent *, struct ntpd_conf *, u_int *);
diff --git a/src/usr.sbin/ntpd/server.c b/src/usr.sbin/ntpd/server.c
index 21852468..754be380 100644
--- a/src/usr.sbin/ntpd/server.c
+++ b/src/usr.sbin/ntpd/server.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: server.c,v 1.36 2011/09/21 15:41:30 phessler Exp $ */
+/*	$OpenBSD: server.c,v 1.37 2013/04/30 11:42:56 mglocker Exp $ */
 
 /*
  * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org>
@@ -210,6 +210,6 @@ server_dispatch(int fd, struct ntpd_conf *lconf)
 	reply.rootdelay = d_to_sfp(lconf->status.rootdelay);
 	reply.refid = lconf->status.refid;
 
-	ntp_sendmsg(fd, (struct sockaddr *)&fsa, &reply, size, 0);
+	ntp_sendmsg(fd, (struct sockaddr *)&fsa, &reply);
 	return (0);
 }