From f107efab9cc0dd8995a5a2820f30d1a43c5d5b1e Mon Sep 17 00:00:00 2001
From: deraadt <>
Date: Tue, 21 Jun 2005 19:55:18 +0000
Subject: [PATCH] we do not do -s in /etc/rc anymore.  this is because, even if
 -s did try to do it's job it would have to choose between two cases: 1.
 either it would take a very long time to get the correct adjustment, thus,   
 if you are not currently on the net right, you wait a long time (or must   
 type ^C, which is ridiculous) 2. ntpd could be modified to "abort early", but
 then would not meet the    promise made by -s in the manual page (note: it
 does not say that it    "tries") therefore, -s and -S must become user
 choices.  Sorry.  This same choice is made in lots of other places

---
 src/usr.sbin/ntpd/ntpd.8 | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

diff --git a/src/usr.sbin/ntpd/ntpd.8 b/src/usr.sbin/ntpd/ntpd.8
index ecc83139..47a9ad78 100644
--- a/src/usr.sbin/ntpd/ntpd.8
+++ b/src/usr.sbin/ntpd/ntpd.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: ntpd.8,v 1.13 2004/12/10 03:54:18 jaredy Exp $
+.\" $OpenBSD: ntpd.8,v 1.14 2005/06/21 19:55:18 deraadt Exp $
 .\"
 .\" Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org>
 .\"
@@ -98,18 +98,6 @@ eliminating the need to run
 .Xr rdate 8
 before starting
 .Nm .
-Currently, the
-.Fl s
-option is added unconditionally in
-.Xr rc 8 .
-Make sure to specify the
-.Fl S
-option
-(add/edit
-.Va ntpd_flags
-in
-.Xr rc.conf.local 8 )
-if this behaviour is not desired.
 .El
 .Sh FILES
 .Bl -tag -width "/etc/ntpd.confXXX" -compact