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

Harlan Stenn stenn at whimsy.udel.edu
Thu May 25 05:09:49 UTC 2006


This BitKeeper patch contains the following changesets:
mayer at pogo.udel.edu|ChangeSet|20060525020155|58593
mayer at pogo.udel.edu|ChangeSet|20060521161013|58597
mayer at pogo.udel.edu|ChangeSet|20060521185746|58597
mayer at pogo.udel.edu|ChangeSet|20060521161046|58593

# 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.46/ntpd/ntp_intres.c	2006-05-20 17:01:06 -04:00
#+++ 1.47/ntpd/ntp_intres.c	2006-05-24 22:01:00 -04:00
#@@ -15,6 +15,11 @@
#  * might go about autoconfiguring an NTP distribution network.
#  *
#  */
#+ /*
#+ * For special situations define the FORCE_DNSRETRY Macro
#+ * to force retries even if it fails the lookup.
#+ * Use with extreme caution since it will then retry forever.
#+ */
# 
# #ifdef HAVE_CONFIG_H
# # include <config.h>
#@@ -525,6 +530,10 @@
# 				   (char *)&entry->ce_name, MAXHOSTNAMELEN,
# 				   NULL, 0, 0);
# 	}
#+#ifdef DEBUG
#+	if (debug > 2)
#+		printf("intres: got error status of: %d\n", error);
#+#endif
# 
# 	/*
# 	 * If the resolver failed, see if the failure is
#@@ -536,7 +545,11 @@
# 		case EAI_AGAIN:
# 			return (1);
# 		case EAI_NONAME:
#+#ifndef FORCE_DNSRETRY
# 			return (0);
#+#else
#+			return (1);
#+#endif
# #if defined(EAI_NODATA) && (EAI_NODATA != EAI_NONAME)
# 		case EAI_NODATA:
# #endif
#
#--- 1.198/ntpd/ntp_io.c	2006-05-20 16:58:11 -04:00
#+++ 1.200/ntpd/ntp_io.c	2006-05-21 14:57:23 -04:00
#@@ -149,8 +149,8 @@
# #ifdef REFCLOCK
# static	void	close_file	P((SOCKET));
# #endif
#-#ifdef F_DUPFD
#-static int	dup_fd		P((int));
#+#if !defined(SYS_WINNT) && defined(F_DUPFD)
#+static int	move_fd		P((int));
# #ifndef FOPEN_MAX
# #define FOPEN_MAX	20
# #endif
#@@ -248,24 +248,22 @@
# }
# #endif
# 
#-#ifdef F_DUPFD
#-static int dup_fd(int fd)
#+#if !defined(SYS_WINNT) && defined(F_DUPFD)
#+static int move_fd(int fd)
# {
#-	int tmp, newfd;
#+	int newfd;
#         /*
#          * Leave a space for stdio to work in.
#          */
#         if (fd >= 0 && fd < FOPEN_MAX) {
#                 newfd = fcntl(fd, F_DUPFD, FOPEN_MAX);
# 
#-                tmp = errno;
#                 if (newfd == -1)
# 		{
# 			msyslog(LOG_ERR, "Error duplicating file descriptor: %m");
#                         return (fd);
# 		}
#                 (void)close(fd);
#-                errno = tmp;
#                 return (newfd);
#         }
# 	else
#@@ -1515,7 +1513,7 @@
# 	 * Fixup the file descriptor for some systems
# 	 * See bug #530 for details of the issue.
# 	 */
#-	fd = dup_fd(fd);
#+	fd = move_fd(fd);
# #endif
# 
# 	/*
#

# Diff checksum=90e53c63


# Patch vers:	1.3
# Patch type:	REGULAR

== ChangeSet ==
stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
stenn at pogo.udel.edu|ChangeSet|20060521060355|58590
D 1.1518.1.1 06/05/21 12:10:13-04:00 mayer at pogo.udel.edu +1 -0
B stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
C
c Bug #614 Changed dup_fd to move_fd and remove for Windows
K 58597
P ChangeSet
------------------------------------------------

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

stenn at whimsy.udel.edu|ChangeSet|20060521110300|58586
D 1.1520 06/05/21 12:10:46-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 mayer at pogo.udel.edu|ChangeSet|20060521161013|58597
K 58593
M mayer at pogo.udel.edu|ChangeSet|20060521161013|58597
P ChangeSet
------------------------------------------------


mayer at pogo.udel.edu|ChangeSet|20060521161046|58593
D 1.1521 06/05/21 14:57:46-04:00 mayer at pogo.udel.edu +1 -0
B stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
C
c Bug #614 Remove errno manipulation from move_fd()
K 58597
P ChangeSet
------------------------------------------------

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

mayer at pogo.udel.edu|ChangeSet|20060521185746|58597
D 1.1522 06/05/24 22:01:55-04:00 mayer at pogo.udel.edu +1 -0
B stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
C
c Bug #504 Allow forced DNS retry even on failure only if macro FORCE_DNSRETRY is defined
K 58593
P ChangeSet
------------------------------------------------

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

== ntpd/ntp_intres.c ==
stenn at whimsy.udel.edu|ntpd/ntp_intres.c|19990526004817|01635|3aed0663
mayer at pogo.udel.edu|ntpd/ntp_intres.c|20060520210106|14737
D 1.47 06/05/24 22:01:00-04:00 mayer at pogo.udel.edu +13 -0
B stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
C
c Bug #504 Allow forced DNS retry even on failure only if macro FORCE_DNSRETRY is defined
K 40826
O -rw-rw-r--
P ntpd/ntp_intres.c
------------------------------------------------

I17 5
 /*
 * For special situations define the FORCE_DNSRETRY Macro
 * to force retries even if it fails the lookup.
 * Use with extreme caution since it will then retry forever.
 */
I527 4
#ifdef DEBUG
	if (debug > 2)
		printf("intres: got error status of: %d\n", error);
#endif
I538 1
#ifndef FORCE_DNSRETRY
I539 3
#else
			return (1);
#endif

== 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|20060520205811|19615
D 1.199 06/05/21 12:09:34-04:00 mayer at pogo.udel.edu +5 -5
B stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
C
c Bug #614 Changed dup_fd to move_fd and remove for Windows
K 24385
O -rw-rw-r--
P ntpd/ntp_io.c
------------------------------------------------

D152 2
I153 2
#if !defined(SYS_WINNT) && defined(F_DUPFD)
static int	move_fd		P((int));
D251 2
I252 2
#if !defined(SYS_WINNT) && defined(F_DUPFD)
static int move_fd(int fd)
D1518 1
I1518 1
	fd = move_fd(fd);

mayer at pogo.udel.edu|ntpd/ntp_io.c|20060521160934|24385
D 1.200 06/05/21 14:57:23-04:00 mayer at pogo.udel.edu +1 -3
B stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
C
c Bug #614 Remove errno manipulation from move_fd()
K 20786
O -rw-rw-r--
P ntpd/ntp_io.c
------------------------------------------------

D254 1
I254 1
	int newfd;
D261 1
D268 1

# Patch checksum=4f3240cb


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