summaryrefslogtreecommitdiffstats
path: root/usr.sbin/xntpd/patches/patch.2
blob: 50a102355f7c2e3b976190c85d216a97ddcfe342 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129

Received: from louie.udel.edu by huey.udel.edu id aa12171; 26 Jan 94 17:04 EST
Received: from faui45.informatik.uni-erlangen.de by louie.udel.edu id aa15368;
          26 Jan 94 17:00 EST
Received: from faui43.informatik.uni-erlangen.de by uni-erlangen.de with SMTP;
	id AA17953 (5.65c-6/7.3v-FAU); Wed, 26 Jan 1994 23:00:40 +0100
Received: from faui45x.informatik.uni-erlangen.de by immd4.informatik.uni-erlangen.de with SMTP;
	id AA29710 (5.65c-6/7.3m-FAU); Wed, 26 Jan 1994 23:00:37 +0100
From: Frank Kardel <Frank.Kardel@informatik.uni-erlangen.de>
Message-Id: <199401262200.AA29710@faui43.informatik.uni-erlangen.de>
Subject: Re:  Solaribum
To: Mills@udel.edu
Date: Wed, 26 Jan 94 23:00:31 MET
Cc: Frank.Kardel@informatik.uni-erlangen.de, Piete.Brooks@cl.cam.ac.uk, 
    Paul_Vixie@corpmis.sjc.hw.sony.com
In-Reply-To:  <9401261207.aa10860@huey.udel.edu>; from "Mills@udel.edu" at Jan 26, 94 12:07 pm
X-Mailer: ELM [version 2.3 PL11]


Sorry, guys - i tripped over a backward compatibility
variable. Thus the second patch:

diff -c include/ntp_control.h:3.6 include/ntp_control.h:3.7
*** include/ntp_control.h:3.6	Wed Jan 26 22:57:52 1994
--- include/ntp_control.h	Wed Jan 26 22:57:52 1994
***************
*** 204,210 ****
  #define	CP_SENT		32
  #define	CP_FILTERROR	33
  #define	CP_FLASH	34
! #define CP_VARLIST	35
  
  #define	CP_MAXCODE	CP_VARLIST
  
--- 204,211 ----
  #define	CP_SENT		32
  #define	CP_FILTERROR	33
  #define	CP_FLASH	34
! #define CP_DISP		35
! #define CP_VARLIST	36
  
  #define	CP_MAXCODE	CP_VARLIST
  
diff -c xntpd/ntp_control.c:3.21 xntpd/ntp_control.c:3.22
*** xntpd/ntp_control.c:3.21	Wed Jan 26 22:58:30 1994
--- xntpd/ntp_control.c	Wed Jan 26 22:58:31 1994
***************
*** 175,181 ****
  	{ CP_SENT,	RO,	"sent" },	/* 32 */
  	{ CP_FILTERROR,	RO,	"filterror" },	/* 33 */
  	{ CP_FLASH,	RO,	"flash" },	/* 34 */
! 	{ CP_VARLIST,	RO,	"peer_var_list" }, /* 35 */
  	{ 0,		EOV,	""	}
  };
  
--- 175,182 ----
  	{ CP_SENT,	RO,	"sent" },	/* 32 */
  	{ CP_FILTERROR,	RO,	"filterror" },	/* 33 */
  	{ CP_FLASH,	RO,	"flash" },	/* 34 */
! 	{ CP_DISP,	PADDING,"" },		/* 35 */
! 	{ CP_VARLIST,	RO,	"peer_var_list" }, /* 36 */
  	{ 0,		EOV,	""	}
  };
  
***************
*** 1298,1303 ****
--- 1299,1307 ----
  
  		  for (k = sys_var; !(k->flags &EOV); k++)
  		    {
+ 		      if (k->flags & PADDING)
+ 			continue;
+ 
  		      i = strlen(k->text);
  		      if (s+i+1 >= be)
  			break;
***************
*** 1309,1314 ****
--- 1313,1321 ----
  
  		  for (k = ext_sys_var; k && !(k->flags &EOV); k++)
  		    {
+ 		      if (k->flags & PADDING)
+ 			continue;
+ 
  		      ss = k->text;
  		      if (!ss)
  			continue;
***************
*** 1484,1489 ****
--- 1491,1499 ----
  
  		  for (k = peer_var; !(k->flags &EOV); k++)
  		    {
+ 		      if (k->flags & PADDING)
+ 			continue;
+ 
  		      i = strlen(k->text);
  		      if (s+i+1 >= be)
  			break;
***************
*** 1594,1599 ****
--- 1604,1612 ----
  
  		  for (k = clock_var; !(k->flags &EOV); k++)
  		    {
+ 		      if (k->flags & PADDING)
+ 			continue;
+ 
  		      i = strlen(k->text);
  		      if (s+i+1 >= be)
  			break;
***************
*** 1605,1610 ****
--- 1618,1626 ----
  
  		  for (k = clock->kv_list; k && !(k->flags &EOV); k++)
  		    {
+ 		      if (k->flags & PADDING)
+ 			continue;
+ 
  		      ss = k->text;
  		      if (!ss)
  			continue;
-- 
	   Frank Kardel (kardel@informatik.uni-erlangen.de)
    All SCSI disks will from now on be required to send an email
         notice 24 hours prior to complete hardware failure!

OpenPOWER on IntegriCloud