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

Harlan Stenn stenn at whimsy.udel.edu
Tue Jan 18 21:46:04 PST 2005


This BitKeeper patch contains the following changesets:
mayer at tecotoo.|ChangeSet|20050117002957|38486
mayer at tecotoo.|ChangeSet|20050118054854|37350
mayer at tecotoo.|ChangeSet|20050117003458|38042

# 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.5/ports/winnt/include/isc/ipv6.h	2004-12-23 00:15:13 -05:00
#+++ 1.6/ports/winnt/include/isc/ipv6.h	2005-01-18 00:47:10 -05:00
#@@ -62,7 +62,7 @@
#  */
# 
# #ifndef IN6_IS_ADDR_UNSPECIFIED
#-#define IN6_IS_ADDR_UNSPECIFIED(a)      \
#+#define IN6_IS_ADDR_UNSPECIFIED(a)     (\
# *((u_long *)((a)->s6_addr)    ) == 0 && \
# *((u_long *)((a)->s6_addr) + 1) == 0 && \
# *((u_long *)((a)->s6_addr) + 2) == 0 && \
#
#--- 1.29/include/ntp_config.h	2004-12-11 22:22:06 -05:00
#+++ 1.30/include/ntp_config.h	2005-01-18 00:47:56 -05:00
#@@ -56,9 +56,8 @@
# #define CONFIG_TTL		35
# #define CONFIG_INCLUDEFILE      36
# #define CONFIG_KEYSDIR		37
#-#define CONFIG_CDELAY		38
# #ifdef OPENSSL
#-#define CONFIG_CRYPTO		39
#+#define CONFIG_CRYPTO		38
# #endif /* OPENSSL */
# 
# /*
#
#--- 1.157/ntpd/ntp_io.c	2005-01-05 22:29:50 -05:00
#+++ 1.158/ntpd/ntp_io.c	2005-01-16 19:28:39 -05:00
#@@ -2167,6 +2167,12 @@
# 	if (rtn == SOCKET_ERROR)
# #endif
# 	{
#+#ifdef DEBUG
#+		if (debug > 2)
#+		{
#+			msyslog(LOG_ERR, "Failed to connect to remote address, error: %m");
#+		}
#+#endif
# 		closesocket(s);
# 		return ANY_INTERFACE_CHOOSE(addr);
# 	}
#

# Diff checksum=8b0f2044


# Patch vers:	1.3
# Patch type:	REGULAR

== ChangeSet ==
stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
mayer at pogo.udel.edu|ChangeSet|20050110043419|38950
D 1.1311.1.1 05/01/16 19:29:57-05:00 mayer at tecotoo. +1 -0
B stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
C
c Added debug code findinterface to see if the connect() fails
K 38486
P ChangeSet
------------------------------------------------

0a0
> stenn at whimsy.udel.edu|ntpd/ntp_io.c|19990526004817|01635|3aed0663 mayer at tecotoo.|ntpd/ntp_io.c|20050117002839|50280

mayer at pogo.udel.edu|ChangeSet|20050111211503|38506
D 1.1314 05/01/16 19:34:58-05:00 mayer at tecotoo. +0 -0
B stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
C
c Merge mayer at pogo.udel.edu:ntp-dev/ into tecotoo.:H:/ntpbk/ntp-dev
i mayer at tecotoo.|ChangeSet|20050117002957|38486
K 38042
M mayer at tecotoo.|ChangeSet|20050117002957|38486
P ChangeSet
------------------------------------------------


mayer at tecotoo.|ChangeSet|20050117003458|38042
D 1.1315 05/01/18 00:48:54-05:00 mayer at tecotoo. +2 -0
B stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
C
c Fix missing parenthesis and remove duplicate CONFIG_CDELAY
K 37350
P ChangeSet
------------------------------------------------

0a0
> stenn at whimsy.udel.edu|include/ntp_config.h|20000729010019|33744|5de683d0 mayer at tecotoo.|include/ntp_config.h|20050118054756|14802
> mayer at tecotoo.myibg.com|ports/winnt/include/isc/ipv6.h|20030105020102|23288|d1fdf9f3 mayer at tecotoo.|ports/winnt/include/isc/ipv6.h|20050118054710|26087

== ports/winnt/include/isc/ipv6.h ==
mayer at tecotoo.myibg.com|ports/winnt/include/isc/ipv6.h|20030105020102|23288|d1fdf9f3
mayer at tecotoo.|ports/winnt/include/isc/ipv6.h|20041223051513|26079
D 1.6 05/01/18 00:47:10-05:00 mayer at tecotoo. +1 -1
B stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
C
c Missing parenthesis in Macro
K 26087
O -rw-rw-r--
P ports/winnt/include/isc/ipv6.h
------------------------------------------------

D65 1
I65 1
#define IN6_IS_ADDR_UNSPECIFIED(a)     (\

== include/ntp_config.h ==
stenn at whimsy.udel.edu|include/ntp_config.h|20000729010019|33744|5de683d0
stenn at whimsy.udel.edu|include/ntp_config.h|20041212032206|16591
D 1.30 05/01/18 00:47:56-05:00 mayer at tecotoo. +1 -2
B stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
C
c Remove duplicate CONFIG_CDELAY
K 14802
O -rw-rw-r--
P include/ntp_config.h
------------------------------------------------

D59 1
D61 1
I61 1
#define CONFIG_CRYPTO		38

== 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|20050106032950|41566
D 1.158 05/01/16 19:28:39-05:00 mayer at tecotoo. +6 -0
B stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
C
K 50280
O -rw-rw-r--
P ntpd/ntp_io.c
------------------------------------------------

I2169 6
#ifdef DEBUG
		if (debug > 2)
		{
			msyslog(LOG_ERR, "Failed to connect to remote address, error: %m");
		}
#endif

# Patch checksum=1c276ead


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