[ntp:bk-ntp-dev-send] BitKeeper diffs

Harlan Stenn stenn at whimsy.udel.edu
Sun Aug 10 06:49:11 UTC 2008


#### ChangeSet ####
2008-08-09 20:56:32-04:00, stenn at whimsy.udel.edu 
  cleanup

==== ChangeLog ====
2008-08-09 20:56:23-04:00, stenn at whimsy.udel.edu +4 -10
  cleanup

--- 1.203/ChangeLog	2008-08-09 20:47:16 -04:00
+++ 1.204/ChangeLog	2008-08-09 20:56:23 -04:00
@@ -92,16 +92,6 @@
 * [Bug 995] Remove spurious ; from ntp-keygen.c.
 * More cleanup and changes from Dave Mills.
 * [Bug 980] Direct help to stdout.
-
----
-
-* [Bug 450] Windows only: Under original Windows NT we must not discard the
-  wildcard socket to workaround a bug in NT's getsockname().
-* [Bug 1038] Built-in getpass() function also prompts for password if
-  not built with DEBUG.
-* [Bug 841] Obsolete the "dynamic" keyword and make deferred binding
-  to local interfaces the default.
-  Emit a warning if that keyword is used for configuration.
 * [Bug 959] Refclock on Windows not properly releasing recvbuffs.
 * [Bug 993] Fix memory leak when fetching system messages.
 * much cleanup, fixes, and changes from Dave Mills.
@@ -306,6 +296,10 @@
 
 ---
 
+* [Bug 450] Windows only: Under original Windows NT we must not discard the
+  wildcard socket to workaround a bug in NT's getsockname().
+* [Bug 1038] Built-in getpass() function also prompts for password if
+  not built with DEBUG.
 * [Bug 841] Obsolete the "dynamic" keyword and make deferred binding
   to local interfaces the default.
   Emit a warning if that keyword is used for configuration.

#### ChangeSet ####
2008-08-09 20:05:06-04:00, stenn at whimsy.udel.edu 
  AutoGen'd files must be writable

==== sntp/Makefile.am ====
2008-08-09 20:04:56-04:00, stenn at whimsy.udel.edu +2 -2
  AutoGen'd files must be writable

--- 1.21.1.1/sntp/Makefile.am	2008-03-22 01:57:11 -05:00
+++ 1.21.1.2/sntp/Makefile.am	2008-08-09 20:04:56 -04:00
@@ -12,8 +12,8 @@ NULL=
 
 bindir=	${exec_prefix}/${BINSUBDIR}
 bin_PROGRAMS=	sntp
-#run_ag=         cd $(srcdir) && autogen -L $(top_srcdir)/include --writable
-run_ag=         cd $(srcdir) && autogen
+#run_ag=         cd $(srcdir) && autogen --writable -L $(top_srcdir)/include
+run_ag=         cd $(srcdir) && autogen --writable
 
 SUBDIRS=
 if NEED_LIBOPTS

==== sntp/sntp-opts.menu ====
2008-08-09 20:04:10-04:00, stenn at whimsy.udel.edu +0 -0
  Change mode to -rw-rw-r--

#### ChangeSet ####
2008-08-07 20:44:31+02:00, burnicki at pogo.udel.edu 
  [Bug 450] Windows only: Under original Windows NT we must not discard the
  wildcard socket to workaround a bug in NT's getsockname().

==== ChangeLog ====
2008-08-07 20:44:30+02:00, burnicki at pogo.udel.edu +2 -0
  [Bug 450] Windows only: Under original Windows NT we must not discard the
  wildcard socket to workaround a bug in NT's getsockname().

--- 1.1.1.38/ChangeLog	2008-04-10 02:31:21 -04:00
+++ 1.1.10.1/ChangeLog	2008-08-07 14:44:30 -04:00
@@ -1,3 +1,5 @@
+* [Bug 450] Windows only: Under original Windows NT we must not discard the
+  wildcard socket to workaround a bug in NT's getsockname().
 * [Bug 959] Refclock on Windows not properly releasing recvbuffs.
 * [Bug 993] Fix memory leak when fetching system messages.
 * [Bug 987] Wake up the resolver thread/process when a new interface has

==== ntpd/ntp_peer.c ====
2008-08-07 20:44:30+02:00, burnicki at pogo.udel.edu +10 -2
  [Bug 450] Windows only: Under original Windows NT we must not discard the
  wildcard socket to workaround a bug in NT's getsockname().

--- 1.97.1.2/ntpd/ntp_peer.c	2007-04-28 06:06:31 -04:00
+++ 1.97.2.1/ntpd/ntp_peer.c	2008-08-07 14:44:30 -04:00
@@ -15,6 +15,10 @@
 #include "openssl/rand.h"
 #endif /* OPENSSL */
 
+#ifdef SYS_WINNT
+extern int accept_wildcard_if_for_winnt;
+#endif
+
 /*
  *                  Table of valid association combinations
  *                  ---------------------------------------
@@ -27,7 +31,7 @@
  * PASSIVE         |   e       1       e       0       0       0
  * CLIENT          |   e       0       0       0       1       1
  * SERVER          |   e       0       0       0       0       0
- * BCAST	   |   e       0       0       0       0       0
+ * BCAST           |   e       0       0       0       0       0
  * BCLIENT         |   e       0       0       0       e       1
  *
  * One point to note here: a packet in BCAST mode can potentially match
@@ -706,7 +710,11 @@ select_peerinterface(struct peer *peer, 
 	 * crypto will not work without knowing the own transmit address
 	 */
 	if (interface != NULL && interface->flags & INT_WILDCARD)
-		interface = NULL;
+#ifdef SYS_WINNT
+		if ( !accept_wildcard_if_for_winnt )  
+#endif
+			interface = NULL;
+
 
 	return interface;
 }

==== ports/winnt/ntpd/ntservice.c ====
2008-08-07 20:44:30+02:00, burnicki at pogo.udel.edu +8 -1
  [Bug 450] Windows only: Under original Windows NT we must not discard the
  wildcard socket to workaround a bug in NT's getsockname().

--- 1.9.1.1/ports/winnt/ntpd/ntservice.c	2008-03-16 08:15:11 -05:00
+++ 1.9.1.2/ports/winnt/ntpd/ntservice.c	2008-08-07 14:44:30 -04:00
@@ -26,6 +26,7 @@
 #include "ntservice.h"
 #include "clockstuff.h"
 #include "ntp_iocompletionport.h"
+#include "isc/win32os.h"
 #ifdef DEBUG
 #include <crtdbg.h>
 #endif
@@ -37,6 +38,7 @@ static char ConsoleTitle[128];
 static int glb_argc;
 static char **glb_argv;
 HANDLE hServDoneEvent = NULL;
+int accept_wildcard_if_for_winnt;
 extern volatile int debug;
 extern char *progname;
 
@@ -78,7 +80,12 @@ int main( int argc, char *argv[] )
 	glb_argc = argc;
 	glb_argv = argv;
 
-	/* Command line users should put -f in the options */
+	/* Under original Windows NT we must not discard the wildcard */
+	/* socket to workaround a bug in NT's getsockname(). */
+	if ( isc_win32os_majorversion() <= 4 )
+		accept_wildcard_if_for_winnt = 1;
+
+	/* Command line users should put -n in the options */
 	while (argv[i]) {
 		if (!_strnicmp(argv[i], "-d", 2) ||
 			!strcmp(argv[i], "-q") ||

#### ChangeSet ####
2008-08-05 09:56:08+02:00, burnicki at pogo.udel.edu 
  Removed Windows-specific debug code which has been added in ntp-dev and fails to compile in ntp-stable.

==== ports/winnt/ntpd/ntp_iocompletionport.c ====
2008-08-05 09:56:08+02:00, burnicki at pogo.udel.edu +0 -8
  Removed Windows-specific debug code which has been added in ntp-dev and fails to compile in ntp-stable.

--- 1.21.1.4/ports/winnt/ntpd/ntp_iocompletionport.c	2008-03-24 20:41:37 -05:00
+++ 1.21.1.5/ports/winnt/ntpd/ntp_iocompletionport.c	2008-08-05 03:56:08 -04:00
@@ -517,15 +517,7 @@ OnSocketRecv(DWORD i, IoCompletionInfo *
 	}
 	else 
 	{
-#ifdef DEBUG
-		if(debug > 3 && get_packet_mode(buff) == MODE_BROADCAST)
-			printf("****Accepting Broadcast packet on fd %d from %s\n", buff->fd, stoa(&buff->recv_srcadr));
-#endif
 		ignore_this = inter->ignore_packets;
-#ifdef DEBUG
-		if (debug > 3)
-			printf(" Packet mode is %d\n", get_packet_mode(buff));
-#endif
 
 		/*
 		 * If we keep it add some info to the structure

#### ChangeSet ####
2008-08-05 09:50:23+02:00, burnicki at pogo.udel.edu 
  [Bug 841] Obsolete the "dynamic" keyword and make deferred binding 
  to local interfaces the default.
  Emit a warning if that keyword is used for configuration.

==== ChangeLog ====
2008-08-05 09:50:23+02:00, burnicki at pogo.udel.edu +3 -0
  [Bug 841] Obsolete the "dynamic" keyword and make deferred binding
  to local interfaces the default.
  Emit a warning if that keyword is used for configuration.

--- 1.1.1.38/ChangeLog	2008-04-10 02:31:21 -04:00
+++ 1.1.9.1/ChangeLog	2008-08-05 03:50:23 -04:00
@@ -1,3 +1,6 @@
+* [Bug 841] Obsolete the "dynamic" keyword and make deferred binding
+  to local interfaces the default.
+  Emit a warning if that keyword is used for configuration.
 * [Bug 959] Refclock on Windows not properly releasing recvbuffs.
 * [Bug 993] Fix memory leak when fetching system messages.
 * [Bug 987] Wake up the resolver thread/process when a new interface has

==== html/confopt.html ====
2008-08-05 09:50:23+02:00, burnicki at pogo.udel.edu +0 -2
  Bug 841: Obsolete the "dynamic" keyword.

--- 1.35/html/confopt.html	2007-01-20 09:37:48 -05:00
+++ 1.35.1.1/html/confopt.html	2008-08-05 03:50:23 -04:00
@@ -64,8 +64,6 @@
 			<dd>This option is used only with broadcast server and manycast client modes. It specifies the time-to-live <i><tt>ttl</tt></i> to use on broadcast server and multicast server and the maximum <i><tt>ttl</tt></i> for the expanding ring search with manycast client packets. Selection of the proper value, which defaults to 127, is something of a black art and should be coordinated with the network administrator.
 			<dt><tt>version <i>version</i></tt>
 			<dd>Specifies the version number to be used for outgoing NTP packets. Versions 1-4 are the choices, with version 4 the default. This option is valid only with the <tt>server,</tt> <tt>peer</tt> and <tt>broadcast</tt> commands.
-			<dt><tt>dynamic</tt>
-			<dd>Allows a server/peer to be configured even if it is not reachable at configuration time. It is assumed that at some point in the future the network environment changes so that this server/peer can be reached. This option is useful to configure servers/peers on mobile systems with intermittent network access (e.g. wlan clients).
 		</dl>
 		<h4 id="aux">Auxilliary Commands</h4>
 		<dl>

==== html/ntpdc.html ====
2008-08-05 09:50:23+02:00, burnicki at pogo.udel.edu +2 -3
  Bug 841: Obsolete the "dynamic" keyword.

--- 1.26/html/ntpdc.html	2006-12-27 01:20:23 -05:00
+++ 1.26.1.1/html/ntpdc.html	2008-08-05 03:50:23 -04:00
@@ -134,7 +134,7 @@
 		<dt><tt>addpeer <i>peer_address</i> [
 		<i>keyid</i> ] [ <i>version</i> ] [
 		<tt>minpoll# | prefer | iburst  | burst | minpoll
-		<i>N</i> | <tt>maxpoll</tt> <i>N</i> [ <i>dynamic</i> ] [...] ]</tt>
+		<i>N</i> | <tt>maxpoll</tt> <i>N</i> [...] ]</tt>
 		<dt><tt>addpeer <i>peer_address</i> [
 		<tt>prefer | iburst | burst | minpoll
 		<i>N</i> | <tt>maxpoll</tt> <i>N</i> | <tt>keyid</tt>
@@ -163,7 +163,6 @@
 			ntpd.  See the <a href="confopt.html">Server Options</a> page for further information.
 			Each flag (or its absence) replaces the
 			previous setting. The <tt>prefer</tt> keyword indicates a preferred peer (and thus will be used primarily for clock synchronisation if possible). The preferred peer also determines the validity of the PPS signal - if the preferred peer is suitable for synchronisation so is the PPS signal.
-			The <tt>dynamic</tt> keyword allows association configuration even when no suitable network interface is found at configuration time. The dynamic interface update mechanism may complete the configuration when new interfaces appear (e.g. WLAN/PPP interfaces) at a later time and thus render the association operable.
 			<dt><tt>addserver <i>peer_address</i> [
 		<i>keyid</i> ] [ <i>version</i> ] [
 		<tt>minpoll# | prefer | iburst  | burst | minpoll
@@ -171,7 +170,7 @@
 		<dt><tt>addserver <i>peer_address</i> [
 		<tt>prefer | iburst | burst | minpoll
 		<i>N</i> | <tt>maxpoll</tt> <i>N</i> | <tt>keyid</tt>
-			<i>N</i> | <tt>version</tt> <i>N</i> [...] [ <i>dynamic</i> ] ]</tt>
+			<i>N</i> | <tt>version</tt> <i>N</i> [...] ]</tt>
 			<dd>Identical to the addpeer command, except that the operating mode is client.
 			<dt><tt>broadcast <i>peer_address</i> [
 			<i>keyid</i> ] [ <i>version</i> ] [ <i>prefer</i> ]</tt>

==== include/ntp.h ====
2008-08-05 09:50:23+02:00, burnicki at pogo.udel.edu +0 -1
  Bug 841: Obsolete the "dynamic" keyword.

--- 1.128/include/ntp.h	2006-03-14 02:20:24 -05:00
+++ 1.128.1.1/include/ntp.h	2008-08-05 03:50:23 -04:00
@@ -433,7 +433,6 @@ struct peer {
 #define FLAG_FIXPOLL	0x1000	/* stick at minpoll */
 #define FLAG_TRUE	0x2000	/* select truechimer */
 #define	FLAG_PREEMPT	0x4000	/* preemptable association */
-#define	FLAG_DYNAMIC	0x8000	/* dynamic addresses - allow configuration even if no interface is found */
 
 /*
  * Definitions for the clear() routine.  We use memset() to clear

==== include/ntp_request.h ====
2008-08-05 09:50:23+02:00, burnicki at pogo.udel.edu +0 -1
  Bug 841: Obsolete the "dynamic" keyword.

--- 1.30/include/ntp_request.h	2006-07-22 05:57:38 -04:00
+++ 1.30.1.1/include/ntp_request.h	2008-08-05 03:50:23 -04:00
@@ -600,7 +600,6 @@ struct conf_peer {
 #define CONF_FLAG_IBURST	0x08
 #define CONF_FLAG_NOSELECT	0x10
 #define CONF_FLAG_SKEY		0x20
-#define CONF_FLAG_DYNAMIC	0x40
 
 /*
  * Structure for passing peer deletion information.  Currently

==== ntpd/ntp_config.c ====
2008-08-05 09:50:23+02:00, burnicki at pogo.udel.edu +4 -2
  [Bug 841] Obsolete the "dynamic" keyword and make deferred binding
  to local interfaces the default.
  Emit a warning if that keyword is used for configuration.

--- 1.141.1.2/ntpd/ntp_config.c	2008-04-03 09:18:59 -05:00
+++ 1.141.1.3/ntpd/ntp_config.c	2008-08-05 03:50:23 -04:00
@@ -813,8 +813,10 @@ getconfig(
 				    peerflags |= FLAG_IBURST;
 				    break;
 
-			        case CONF_MOD_DYNAMIC:
-				    peerflags |= FLAG_DYNAMIC;
+				case CONF_MOD_DYNAMIC:
+				    msyslog(LOG_WARNING, 
+				        "Warning: the \"dynamic\" keyword has been obsoleted"
+				        " and will be removed in the next release\n");
 				    break;
 
 #ifdef OPENSSL

==== ntpd/ntp_intres.c ====
2008-08-05 09:50:23+02:00, burnicki at pogo.udel.edu +1 -3
  Bug 841: Obsolete the "dynamic" keyword.

--- 1.48.1.3/ntpd/ntp_intres.c	2008-04-08 06:20:21 -04:00
+++ 1.48.1.4/ntpd/ntp_intres.c	2008-08-05 03:50:23 -04:00
@@ -1051,7 +1051,7 @@ readconf(
 		}
 
 		if ((intval[TOK_FLAGS] & ~(FLAG_AUTHENABLE | FLAG_PREFER |
-		    FLAG_NOSELECT | FLAG_BURST | FLAG_IBURST | FLAG_SKEY | FLAG_DYNAMIC))
+		    FLAG_NOSELECT | FLAG_BURST | FLAG_IBURST | FLAG_SKEY))
 		    != 0) {
 			msyslog(LOG_ERR, "invalid flags (%ld) in file %s",
 				intval[TOK_FLAGS], name);
@@ -1071,8 +1071,6 @@ readconf(
 		    flags |= CONF_FLAG_IBURST;
 		if (intval[TOK_FLAGS] & FLAG_SKEY)
 		    flags |= CONF_FLAG_SKEY;
-		if (intval[TOK_FLAGS] & FLAG_DYNAMIC)
-		    flags |= CONF_FLAG_DYNAMIC;
 
 		/*
 		 * This is as good as we can check it.  Add it in.

==== ntpd/ntp_peer.c ====
2008-08-05 09:50:23+02:00, burnicki at pogo.udel.edu +5 -25
  [Bug 841] Obsolete the "dynamic" keyword and make deferred binding
  to local interfaces the default.

--- 1.97.1.2/ntpd/ntp_peer.c	2007-04-28 06:06:31 -04:00
+++ 1.97.1.3/ntpd/ntp_peer.c	2008-08-05 03:50:23 -04:00
@@ -759,45 +759,25 @@ newpeer(
 		    cast_flags, stoa(srcadr)));
 
 	ISC_LINK_INIT(peer, ilink);  /* set up interface link chain */
-
-	dstadr = select_peerinterface(peer, srcadr, dstadr, cast_flags);
-	
-	/*
-	 * If we can't find an interface to use we return a NULL
-	 * unless the DYNAMIC flag is set - then we expect the dynamic
-	 * interface detection code to bind us some day to an interface
-	 */
-	if (dstadr == NULL && !(flags & FLAG_DYNAMIC))
-	{
-		msyslog(LOG_ERR, "Cannot find existing interface for address %s", stoa(srcadr));
-
-		peer->next = peer_free;
-		peer_free = peer;
-		peer_associations--;
-		peer_free_count++;
-		
-		return (NULL);
-	}
-	
 	peer->srcadr = *srcadr;
+	set_peerdstadr(peer, select_peerinterface(peer, srcadr, dstadr,
+	    cast_flags));
 	peer->hmode = (u_char)hmode;
 	peer->version = (u_char)version;
 	peer->minpoll = (u_char)max(NTP_MINPOLL, minpoll);
 	peer->maxpoll = (u_char)min(NTP_MAXPOLL, maxpoll);
 	peer->flags = flags;
-
-	set_peerdstadr(peer, dstadr);
-
 #ifdef DEBUG
 	if (debug > 2) {
 		if (peer->dstadr)
 			printf("newpeer: using fd %d and our addr %s\n",
-			       peer->dstadr->fd, stoa(&peer->dstadr->sin));
+				    peer->dstadr->fd,
+				    stoa(&peer->dstadr->sin));
 		else
 			printf("newpeer: local interface currently not bound\n");
 	}
 #endif
-	
+
 	/*
 	 * Broadcast needs the socket enabled for broadcast
 	 */

==== ntpd/ntp_request.c ====
2008-08-05 09:50:23+02:00, burnicki at pogo.udel.edu +1 -3
  Bug 841: Obsolete the "dynamic" keyword.

--- 1.65/ntpd/ntp_request.c	2006-03-14 03:12:13 -05:00
+++ 1.65.1.1/ntpd/ntp_request.c	2008-08-05 03:50:23 -04:00
@@ -1345,7 +1345,7 @@ do_conf(
 		    && temp_cp.hmode != MODE_BROADCAST)
 		    fl = 1;
 		if (temp_cp.flags & ~(CONF_FLAG_AUTHENABLE | CONF_FLAG_PREFER
-				  | CONF_FLAG_BURST | CONF_FLAG_IBURST | CONF_FLAG_SKEY | CONF_FLAG_DYNAMIC))
+				  | CONF_FLAG_BURST | CONF_FLAG_IBURST | CONF_FLAG_SKEY))
 		    fl = 1;
 		cp = (struct conf_peer *)
 		    ((char *)cp + INFO_ITEMSIZE(inpkt->mbz_itemsize));
@@ -1378,8 +1378,6 @@ do_conf(
 		    fl |= FLAG_IBURST;
 		if (temp_cp.flags & CONF_FLAG_SKEY)
 			fl |= FLAG_SKEY;
-		if (temp_cp.flags & CONF_FLAG_DYNAMIC)
-			fl |= FLAG_DYNAMIC;
 		
 		if (client_v6_capable && temp_cp.v6_flag != 0) {
 			peeraddr.ss_family = AF_INET6;

==== ntpdc/ntpdc_ops.c ====
2008-08-05 09:50:23+02:00, burnicki at pogo.udel.edu +3 -3
  [Bug 841] Obsolete the "dynamic" keyword and make deferred binding
  to local interfaces the default.

--- 1.46.1.3/ntpdc/ntpdc_ops.c	2007-08-19 05:20:34 -04:00
+++ 1.46.1.4/ntpdc/ntpdc_ops.c	2008-08-05 03:50:23 -04:00
@@ -119,10 +119,10 @@ struct xcmd opcmds[] = {
 	  { "", "", "", "" },
 	  "display event timer subsystem statistics" },
 	{ "addpeer",	addpeer,	{ NTP_ADD, OPT|NTP_STR, OPT|NTP_STR, OPT|NTP_STR },
-	  { "addr", "keyid", "version", "minpoll#|prefer|burst|iburst|dynamic|'minpoll N'|'maxpoll N'|'keyid N'|'version N' ..." },
+	  { "addr", "keyid", "version", "minpoll#|prefer|burst|iburst|'minpoll N'|'maxpoll N'|'keyid N'|'version N' ..." },
 	  "configure a new peer association" },
 	{ "addserver",	addserver,	{ NTP_ADD, OPT|NTP_STR, OPT|NTP_STR, OPT|NTP_STR },
-	  { "addr", "keyid", "version", "minpoll#|prefer|burst|iburst|dynamic|'minpoll N'|'maxpoll N'|'keyid N'|'version N' ..." },
+	  { "addr", "keyid", "version", "minpoll#|prefer|burst|iburst|'minpoll N'|'maxpoll N'|'keyid N'|'version N' ..." },
 	  "configure a new server" },
 	{ "addrefclock",addrefclock,	{ NTP_ADD, OPT|NTP_UINT, OPT|NTP_STR, OPT|NTP_STR },
 	  { "addr", "mode", "minpoll|prefer", "minpoll|prefer" },
@@ -1333,7 +1333,7 @@ again:
 		else if (STREQ(pcmd->argval[items].string, "burst"))
 		    flags |= CONF_FLAG_BURST;
 		else if (STREQ(pcmd->argval[items].string, "dynamic"))
-                    flags |= CONF_FLAG_DYNAMIC;
+		    (void) fprintf(fp, "Warning: the \"dynamic\" keyword has been obsoleted and will be removed in the next release\n"); 
 		else if (STREQ(pcmd->argval[items].string, "iburst"))
 		    flags |= CONF_FLAG_IBURST;
 		else if (!refc && STREQ(pcmd->argval[items].string, "keyid"))

#### ChangeSet ####
2008-07-22 11:41:26+02:00, burnicki at pogo.udel.edu 
  [Bug 1038] Built-in getpass() function also prompts for password if not built with DEBUG.

==== ChangeLog ====
2008-07-22 11:41:25+02:00, burnicki at pogo.udel.edu +1 -0
  [Bug 1038] Built-in getpass() function also prompts for password if not built with DEBUG.

--- 1.1.1.38/ChangeLog	2008-04-10 02:31:21 -04:00
+++ 1.1.1.39/ChangeLog	2008-07-22 05:41:25 -04:00
@@ -1,3 +1,4 @@
+* [Bug 1038] Built-in getpass() function also prompts for password if not built with DEBUG.
 * [Bug 959] Refclock on Windows not properly releasing recvbuffs.
 * [Bug 993] Fix memory leak when fetching system messages.
 * [Bug 987] Wake up the resolver thread/process when a new interface has

==== libntp/machines.c ====
2008-07-22 11:41:25+02:00, burnicki at pogo.udel.edu +2 -2
  [Bug 1038] Built-in getpass() function also prompts for password if not built with DEBUG.

--- 1.18/libntp/machines.c	2005-10-21 23:39:28 -04:00
+++ 1.19/libntp/machines.c	2008-07-22 05:41:25 -04:00
@@ -500,10 +500,10 @@ getpass(const char * prompt)
 {
 	int c, i;
 	static char password[32];
-#ifdef DEBUG
+
 	fprintf(stderr, "%s", prompt);
 	fflush(stderr);
-#endif
+
 	for (i=0; i<sizeof(password)-1 && ((c=_getch())!='\n' && c!='\r'); i++) {
 		password[i] = (char) c;
 	}


More information about the bk-ntp-dev-send mailing list