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

Harlan Stenn stenn at whimsy.udel.edu
Sun May 21 06:08:48 UTC 2006


This BitKeeper patch contains the following changesets:
mayer at pogo.udel.edu|ChangeSet|20060515234534|58499
mayer at pogo.udel.edu|ChangeSet|20060515233022|58737
mayer at pogo.udel.edu|ChangeSet|20060520231550|58479
mayer at pogo.udel.edu|ChangeSet|20060513161956|58727
stenn at pogo.udel.edu|ChangeSet|20060521060355|58590
mayer at pogo.udel.edu|ChangeSet|20060520210151|58477
mayer at pogo.udel.edu|ChangeSet|20060516115839|58498
mayer at pogo.udel.edu|ChangeSet|20060511035545|58467

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# ID:	stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
# User:	stenn
# Host:	whimsy.udel.edu
# Root:	/deacon/backroom/ntp-dev

#
#--- 1.28/libntp/ntp_rfc2553.c	2006-05-05 08:42:45 -04:00
#+++ 1.31/libntp/ntp_rfc2553.c	2006-05-20 19:14:58 -04:00
#@@ -101,10 +101,12 @@
# 	"Unknown error", 				/* EAI_MAX        */
# };
# 
#-
#+/*
#+ * Local declaration
#+ */
# int
# DNSlookup_name(
#-	const char FAR *name,
#+	const char *name,
# 	int ai_family,
# 	struct hostent **Addresses
# );
#@@ -115,7 +117,7 @@
#  */
# int
# DNSlookup_name(
#-	const char FAR *name,
#+	const char *name,
# 	int ai_family,
# 	struct hostent **Addresses
# )
#@@ -253,7 +255,7 @@
# 		port = 0;
# 
# 	/*
#-	/*
#+	 *
# 	 * Set up the port number
# 	 */
# 	if (ai->ai_family == AF_INET)
#
#--- 1.2/ports/winnt/libntp/dnslookup.c	2006-05-05 08:47:26 -04:00
#+++ 1.3/ports/winnt/libntp/dnslookup.c	2006-05-20 19:15:27 -04:00
#@@ -53,7 +53,7 @@
# 	case 0:
# 		return (0);
# 	case WSAEINVAL:
#-		return (EAI_BADHINTS);
#+		return (EAI_BADFLAGS);
# 	case WSANO_DATA:
# 		return (EAI_NONAME);
# 	case WSANOTINITIALISED:
#@@ -62,7 +62,7 @@
# 	case WSA_NOT_ENOUGH_MEMORY:
# 		return (EAI_MEMORY);
# 	default:
#-		return (EAI_SYSTEM);
#+		return (EAI_FAIL);
# 	}
# }
# 
#@@ -98,7 +98,7 @@
# 
# int
# DNSlookup_name(
#-	const char FAR *name,
#+	const char *name,
# 	int ai_family,
# 	struct hostent **Addresses
# )
#
#--- 1.44/ntpd/ntp_intres.c	2006-05-12 14:57:20 -04:00
#+++ 1.46/ntpd/ntp_intres.c	2006-05-20 17:01:06 -04:00
#@@ -528,7 +528,7 @@
# 
# 	/*
# 	 * If the resolver failed, see if the failure is
#-	 * temporary.  If so, return success.
#+	 * temporary. If so, return success.
# 	 */
# 	if (error != 0) {
# 		switch (error)
#@@ -541,8 +541,10 @@
# 		case EAI_NODATA:
# #endif
# 		case EAI_FAIL:
#+#ifdef EAI_SYSTEM
# 		case EAI_SYSTEM:
# 			return (1);
#+#endif
# 		default:
# 			return (0);
# 		}
#
#--- 1.195/ntpd/ntp_io.c	2006-03-16 17:55:03 -05:00
#+++ 1.198/ntpd/ntp_io.c	2006-05-20 16:58:11 -04:00
#@@ -151,6 +151,9 @@
# #endif
# #ifdef F_DUPFD
# static int	dup_fd		P((int));
#+#ifndef FOPEN_MAX
#+#define FOPEN_MAX	20
#+#endif
# #endif
# 
# static	char *	fdbits		P((int, fd_set *));
#@@ -252,16 +255,21 @@
#         /*
#          * Leave a space for stdio to work in.
#          */
#-        if (fd >= 0 && fd < 20) {
#-                newfd = fcntl(fd, F_DUPFD, 20);
#+        if (fd >= 0 && fd < FOPEN_MAX) {
#+                newfd = fcntl(fd, F_DUPFD, FOPEN_MAX);
# 
#                 tmp = errno;
#                 if (newfd == -1)
#-                        perror("fcntl");
#+		{
#+			msyslog(LOG_ERR, "Error duplicating file descriptor: %m");
#+                        return (fd);
#+		}
#                 (void)close(fd);
#                 errno = tmp;
#                 return (newfd);
#         }
#+	else
#+		return (fd);
# }
# #endif
# 
#@@ -1502,16 +1510,18 @@
# 	}
# #endif /* SYS_WINNT */
# 
#-#ifdef F_DUPFD
#+#if !defined(SYS_WINNT) && defined(F_DUPFD)
# 	/*
# 	 * Fixup the file descriptor for some systems
#+	 * See bug #530 for details of the issue.
# 	 */
# 	fd = dup_fd(fd);
# #endif
# 
#-
#-	/* set SO_REUSEADDR since we will be binding the same port
#-	   number on each interface */
#+	/*
#+	 * set SO_REUSEADDR since we will be binding the same port
#+	 * number on each interface
#+	 */
# 	if (setsockopt(fd, SOL_SOCKET, SO_REUSEADDR,
# 		       (char *)&on, sizeof(on)))
# 	{
#

# Diff checksum=5f3d4110


# Patch vers:	1.3
# Patch type:	REGULAR

== ChangeSet ==
stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
stenn at whimsy.udel.edu|ChangeSet|20060510190524|58470
D 1.1511 06/05/10 23:55:45-04:00 mayer at pogo.udel.edu +1 -0
B stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
C
c Bug #611 Fix for EAI_* codes and netent definitions
K 58467
P ChangeSet
------------------------------------------------

0a0
> jhay at angel.cids.org.za|libntp/ntp_rfc2553.c|20011004194249|12627|ba0e411f8e42699a mayer at pogo.udel.edu|libntp/ntp_rfc2553.c|20060511035508|49433

mayer at pogo.udel.edu|ChangeSet|20060511035545|58467
D 1.1512 06/05/13 12:19:56-04:00 mayer at pogo.udel.edu +0 -0
B stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
C
c Merge bk://www.ntp.org/home/bk/ntp-dev
c into  pogo.udel.edu:/pogo/users/mayer/ntp-dev
i stenn at whimsy.udel.edu|ChangeSet|20060511174528|58472
i kardel at pogo.udel.edu|ChangeSet|20060512162902|58492
i stenn at whimsy.udel.edu|ChangeSet|20060512185738|58732
i stenn at whimsy.udel.edu|ChangeSet|20060513110251|58730
K 58727
M stenn at whimsy.udel.edu|ChangeSet|20060513110251|58730
P ChangeSet
------------------------------------------------


mayer at pogo.udel.edu|ChangeSet|20060513161956|58727
D 1.1513 06/05/15 19:30:22-04:00 mayer at pogo.udel.edu +1 -0
B stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
C
c Bug #614 Fix duplicate descriptor code and properly handle error conditions
K 58737
P ChangeSet
------------------------------------------------

0a0
> stenn at whimsy.udel.edu|ntpd/ntp_io.c|19990526004817|01635|3aed0663 mayer at pogo.udel.edu|ntpd/ntp_io.c|20060515232952|09271

mayer at pogo.udel.edu|ChangeSet|20060515233022|58737
D 1.1514 06/05/15 19:45:34-04:00 mayer at pogo.udel.edu +1 -0
B stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
C
c Bug #611. Refix to add additional condition for Win32
K 58499
P ChangeSet
------------------------------------------------

0a0
> stenn at whimsy.udel.edu|ntpd/ntp_intres.c|19990526004817|01635|3aed0663 mayer at pogo.udel.edu|ntpd/ntp_intres.c|20060515234422|14769

mayer at pogo.udel.edu|ChangeSet|20060515234534|58499
D 1.1515 06/05/16 07:58:39-04:00 mayer at pogo.udel.edu +1 -0
B stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
C
c Bug #614 Add FOPEN_MAX as a parameter for dup_fd() usage. Also this is the fix for Bug #530
K 58498
P ChangeSet
------------------------------------------------

0a0
> stenn at whimsy.udel.edu|ntpd/ntp_io.c|19990526004817|01635|3aed0663 mayer at pogo.udel.edu|ntpd/ntp_io.c|20060516115806|13942

mayer at pogo.udel.edu|ChangeSet|20060516115839|58498
D 1.1516 06/05/20 17:01:51-04:00 mayer at pogo.udel.edu +3 -0
B stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
C
c  Bug fixes for #611, 612, 614 and 530
K 58477
P ChangeSet
------------------------------------------------

0a0
> jhay at angel.cids.org.za|libntp/ntp_rfc2553.c|20011004194249|12627|ba0e411f8e42699a mayer at pogo.udel.edu|libntp/ntp_rfc2553.c|20060520205938|51435
> stenn at whimsy.udel.edu|ntpd/ntp_intres.c|19990526004817|01635|3aed0663 mayer at pogo.udel.edu|ntpd/ntp_intres.c|20060520210106|14737
> stenn at whimsy.udel.edu|ntpd/ntp_io.c|19990526004817|01635|3aed0663 mayer at pogo.udel.edu|ntpd/ntp_io.c|20060520205811|19615

mayer at pogo.udel.edu|ChangeSet|20060520210151|58477
D 1.1517 06/05/20 19:15:50-04:00 mayer at pogo.udel.edu +2 -0
B stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
C
c Fix Bug #612: Erroneous FAR macro
K 58479
P ChangeSet
------------------------------------------------

0a0
> jhay at angel.cids.org.za|libntp/ntp_rfc2553.c|20011004194249|12627|ba0e411f8e42699a mayer at pogo.udel.edu|libntp/ntp_rfc2553.c|20060520231458|47313
> mayer at pogo.udel.edu|ports/winnt/libntp/dnslookup.c|20060505123640|29554|96398d4d3428670 mayer at pogo.udel.edu|ports/winnt/libntp/dnslookup.c|20060520231527|32685

mayer at pogo.udel.edu|ChangeSet|20060520231550|58479
D 1.1518 06/05/21 02:03:55-04:00 stenn at pogo.udel.edu +0 -0
B stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
C
c Merge bk://www.ntp.org/home/bk/ntp-dev
c into  pogo.udel.edu:/pogo/users/mayer/ntp-dev
i stenn at whimsy.udel.edu|ChangeSet|20060520221607|58841
K 58590
M stenn at whimsy.udel.edu|ChangeSet|20060520221607|58841
P ChangeSet
------------------------------------------------


== libntp/ntp_rfc2553.c ==
jhay at angel.cids.org.za|libntp/ntp_rfc2553.c|20011004194249|12627|ba0e411f8e42699a
mayer at pogo.udel.edu|libntp/ntp_rfc2553.c|20060505124245|45809
D 1.29 06/05/10 23:55:08-04:00 mayer at pogo.udel.edu +3 -0
B stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
C
c Bug #612 Fix for EAI_* codes and netent definitions - add netdb.h include
K 49433
O -rw-rw-r--
P libntp/ntp_rfc2553.c
------------------------------------------------

I76 3
#ifndef SYS_WINNT
#include <netdb.h>
#endif

mayer at pogo.udel.edu|libntp/ntp_rfc2553.c|20060511035508|49433
D 1.30 06/05/20 16:59:38-04:00 mayer at pogo.udel.edu +4 -2
B stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
C
c Bug #612 Added include for netent structure
K 51435
O -rw-rw-r--
P libntp/ntp_rfc2553.c
------------------------------------------------

D107 1
I107 3
/*
 * Local declaration
 */
D259 1
I259 1
	 *

mayer at pogo.udel.edu|libntp/ntp_rfc2553.c|20060520205938|51435
D 1.31 06/05/20 19:14:58-04:00 mayer at pogo.udel.edu +2 -5
B stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
C
c Fix Bug #612: Erroneous FAR macro
K 47313
O -rw-rw-r--
P libntp/ntp_rfc2553.c
------------------------------------------------

D77 3
D112 1
I112 1
	const char *name,
D123 1
I123 1
	const char *name,

== ports/winnt/libntp/dnslookup.c ==
mayer at pogo.udel.edu|ports/winnt/libntp/dnslookup.c|20060505123640|29554|96398d4d3428670
mayer at pogo.udel.edu|ports/winnt/libntp/dnslookup.c|20060505124726|33160
D 1.3 06/05/20 19:15:27-04:00 mayer at pogo.udel.edu +3 -3
B stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
C
c Fix Bug #612: Erroneous FAR macro
K 32685
O -rw-rw-r--
P ports/winnt/libntp/dnslookup.c
------------------------------------------------

D56 1
I56 1
		return (EAI_BADFLAGS);
D65 1
I65 1
		return (EAI_FAIL);
D101 1
I101 1
	const char *name,

== ntpd/ntp_intres.c ==
stenn at whimsy.udel.edu|ntpd/ntp_intres.c|19990526004817|01635|3aed0663
stenn at whimsy.udel.edu|ntpd/ntp_intres.c|20060512185720|12832
D 1.45 06/05/15 19:44:22-04:00 mayer at pogo.udel.edu +2 -0
B stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
C
c Bug #611. Refix to add additional condition for Win32
K 14769
O -rw-rw-r--
P ntpd/ntp_intres.c
------------------------------------------------

I543 1
#ifdef EAI_SYSTEM
I545 1
#endif

mayer at pogo.udel.edu|ntpd/ntp_intres.c|20060515234422|14769
D 1.46 06/05/20 17:01:06-04:00 mayer at pogo.udel.edu +1 -1
B stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
C
c Bug #611 Check for various EAI_* macros
K 14737
O -rw-rw-r--
P ntpd/ntp_intres.c
------------------------------------------------

D531 1
I531 1
	 * temporary. If so, return success.

== ntpd/ntp_io.c ==
stenn at whimsy.udel.edu|ntpd/ntp_io.c|19990526004817|01635|3aed0663
mayer at pogo.udel.edu|ntpd/ntp_io.c|20060316225503|02626
D 1.196 06/05/15 19:29:52-04:00 mayer at pogo.udel.edu +6 -1
B stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
C
c Bug #614 Fix duplicate descriptor code and properly handle error conditions
K 9271
O -rw-rw-r--
P ntpd/ntp_io.c
------------------------------------------------

D260 1
I260 4
		{
			msyslog(LOG_ERR, "Error duplicating file descriptor: %m");
                        return (fd);
		}
I264 2
	else
		return (fd);

mayer at pogo.udel.edu|ntpd/ntp_io.c|20060515232952|09271
D 1.197 06/05/16 07:58:06-04:00 mayer at pogo.udel.edu +5 -2
B stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
C
c Bug #614 Add FOPEN_MAX as a parameter for dup_fd() usage. Also this is the fix for Bug #530
K 13942
O -rw-rw-r--
P ntpd/ntp_io.c
------------------------------------------------

I153 3
#ifndef FOPEN_MAX
#define FOPEN_MAX	20
#endif
D255 2
I256 2
        if (fd >= 0 && fd < FOPEN_MAX) {
                newfd = fcntl(fd, F_DUPFD, FOPEN_MAX);

mayer at pogo.udel.edu|ntpd/ntp_io.c|20060516115806|13942
D 1.198 06/05/20 16:58:11-04:00 mayer at pogo.udel.edu +6 -4
B stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
C
c Bug #530 and #614 fixes to add comments
K 19615
O -rw-rw-r--
P ntpd/ntp_io.c
------------------------------------------------

D1513 1
I1513 1
#if !defined(SYS_WINNT) && defined(F_DUPFD)
I1515 1
	 * See bug #530 for details of the issue.
D1520 3
I1522 4
	/*
	 * set SO_REUSEADDR since we will be binding the same port
	 * number on each interface
	 */

# Patch checksum=0257c93b


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