ChangeLog, NEWS, notes.htm, ntp_refclock.c:

  * ntpd/ntp_refclock.c (refclock_open): Add O_CNOTTY to the open()
  flags when opening a serial port.
  Reported by: joseph lang <tcnojl1@earthlink.net>
  * html/notes.htm: Typo fix.
  From: John Stone <johns@ks.uiuc.edu>
ChangeLog:
  Typo...

bk: 3b19946feHslWoTyew0mKlOC9ZGtug

diff --git a/ChangeLog b/ChangeLog
index 39ba09be45149be85597b99951c4e06f44a8f958..f42ba6768b0318e46eafd7a2471d61340685f40a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,17 @@
+2001-06-02  Harlan Stenn  <stenn@whimsy.udel.edu>
+
+       * ntpd/ntp_refclock.c (refclock_open): Add O_NOCTTY to the open()
+       flags when opening a serial port.
+       Reported by: joseph lang <tcnojl1@earthlink.net>
+
 2001-05-31  Harlan Stenn  <stenn@whimsy.udel.edu>
 
+       * html/notes.htm: Typo fix.
+       From: John Stone <johns@ks.uiuc.edu>
+
        * configure.in: 4.0.99m-rc1
 
-       * html/monopt.htm: Typo.
+       * html/monopt.htm: Typo fix.
        * html/confopt.htm: Cruft removal.
        From: John Stone <johns@ks.uiuc.edu>
 

diff --git a/NEWS b/NEWS
index 9806a07523cb8bcbb8b189e733929bc38bf98612..e8bfb7607938b59ec3dd0dd160b9ceb4e19d5e4a 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,4 @@
+* Huff-n-Puff filter
 * Preparation for OpenSSL support
 * Resolver changes/improvements are not backward compatible with mode 7
   requests (which are implementation-specific anyway)

diff --git a/html/notes.htm b/html/notes.htm
index e9f648cd2ccf591fde843016052577f130aca582..c3f1ee06ec344089ad364c57784bf9d74bd32734 100644 (file)
--- a/html/notes.htm
+++ b/html/notes.htm
@@ -724,7 +724,7 @@ for the original NTP specification, once called NTP Version 0.
 <H4>
 Traffic Monitoring</H4>
 <TT>ntpd</TT> handles peers whose stratum is higher than the stratum of
-the local server and pollers using client mode by a fast path which
+the local server and polls using client mode by a fast path which
 minimizes
 the work done in responding to their polls, and normally retains no
 memory

diff --git a/ntpd/ntp_refclock.c b/ntpd/ntp_refclock.c
index e8eb5f91ce2bd533dd17953e4450d1d64d18c102..2205b6ca2ddc33025f22a4abeedc8a20ff5508f1 100644 (file)
--- a/ntpd/ntp_refclock.c
+++ b/ntpd/ntp_refclock.c
@@ -682,16 +682,23 @@ refclock_open(
 #ifdef TIOCMGET
        u_long ltemp;
 #endif /* TIOCMGET */
+       int omode;
 
        /*
         * Open serial port and set default options
         */
        flags = lflags;
+
+       omode = O_RDWR;
 #ifdef O_NONBLOCK
-       fd = open(dev, O_RDWR | O_NONBLOCK, 0777);
-#else
-       fd = open(dev, O_RDWR, 0777);
-#endif /* O_NONBLOCK */
+       omode |= O_NONBLOCK;
+#endif
+#ifdef O_NOCTTY
+       omode |= O_NOCTTY;
+#endif
+
+       fd = open(dev, omode, 0777);
+
        if (fd < 0) {
                msyslog(LOG_ERR, "refclock_open: %s: %m", dev);
                return (0);