Oh GACK! src-clean doesn't quite work that easily since cleandist rebuilds the
[unix-history] / contrib / xntpd / patches / patch.2
CommitLineData
3bbcbb94
GW
1\ 1\ 1\ 1\ 1
2Received: from louie.udel.edu by huey.udel.edu id aa12171; 26 Jan 94 17:04 EST
3Received: from faui45.informatik.uni-erlangen.de by louie.udel.edu id aa15368;
4 26 Jan 94 17:00 EST
5Received: from faui43.informatik.uni-erlangen.de by uni-erlangen.de with SMTP;
6 id AA17953 (5.65c-6/7.3v-FAU); Wed, 26 Jan 1994 23:00:40 +0100
7Received: from faui45x.informatik.uni-erlangen.de by immd4.informatik.uni-erlangen.de with SMTP;
8 id AA29710 (5.65c-6/7.3m-FAU); Wed, 26 Jan 1994 23:00:37 +0100
9From: Frank Kardel <Frank.Kardel@informatik.uni-erlangen.de>
10Message-Id: <199401262200.AA29710@faui43.informatik.uni-erlangen.de>
11Subject: Re: Solaribum
12To: Mills@udel.edu
13Date: Wed, 26 Jan 94 23:00:31 MET
14Cc: Frank.Kardel@informatik.uni-erlangen.de, Piete.Brooks@cl.cam.ac.uk,
15 Paul_Vixie@corpmis.sjc.hw.sony.com
16In-Reply-To: <9401261207.aa10860@huey.udel.edu>; from "Mills@udel.edu" at Jan 26, 94 12:07 pm
17X-Mailer: ELM [version 2.3 PL11]
18
19
20Sorry, guys - i tripped over a backward compatibility
21variable. Thus the second patch:
22
23diff -c include/ntp_control.h:3.6 include/ntp_control.h:3.7
24*** include/ntp_control.h:3.6 Wed Jan 26 22:57:52 1994
25--- include/ntp_control.h Wed Jan 26 22:57:52 1994
26***************
27*** 204,210 ****
28 #define CP_SENT 32
29 #define CP_FILTERROR 33
30 #define CP_FLASH 34
31! #define CP_VARLIST 35
32
33 #define CP_MAXCODE CP_VARLIST
34
35--- 204,211 ----
36 #define CP_SENT 32
37 #define CP_FILTERROR 33
38 #define CP_FLASH 34
39! #define CP_DISP 35
40! #define CP_VARLIST 36
41
42 #define CP_MAXCODE CP_VARLIST
43
44diff -c xntpd/ntp_control.c:3.21 xntpd/ntp_control.c:3.22
45*** xntpd/ntp_control.c:3.21 Wed Jan 26 22:58:30 1994
46--- xntpd/ntp_control.c Wed Jan 26 22:58:31 1994
47***************
48*** 175,181 ****
49 { CP_SENT, RO, "sent" }, /* 32 */
50 { CP_FILTERROR, RO, "filterror" }, /* 33 */
51 { CP_FLASH, RO, "flash" }, /* 34 */
52! { CP_VARLIST, RO, "peer_var_list" }, /* 35 */
53 { 0, EOV, "" }
54 };
55
56--- 175,182 ----
57 { CP_SENT, RO, "sent" }, /* 32 */
58 { CP_FILTERROR, RO, "filterror" }, /* 33 */
59 { CP_FLASH, RO, "flash" }, /* 34 */
60! { CP_DISP, PADDING,"" }, /* 35 */
61! { CP_VARLIST, RO, "peer_var_list" }, /* 36 */
62 { 0, EOV, "" }
63 };
64
65***************
66*** 1298,1303 ****
67--- 1299,1307 ----
68
69 for (k = sys_var; !(k->flags &EOV); k++)
70 {
71+ if (k->flags & PADDING)
72+ continue;
73+
74 i = strlen(k->text);
75 if (s+i+1 >= be)
76 break;
77***************
78*** 1309,1314 ****
79--- 1313,1321 ----
80
81 for (k = ext_sys_var; k && !(k->flags &EOV); k++)
82 {
83+ if (k->flags & PADDING)
84+ continue;
85+
86 ss = k->text;
87 if (!ss)
88 continue;
89***************
90*** 1484,1489 ****
91--- 1491,1499 ----
92
93 for (k = peer_var; !(k->flags &EOV); k++)
94 {
95+ if (k->flags & PADDING)
96+ continue;
97+
98 i = strlen(k->text);
99 if (s+i+1 >= be)
100 break;
101***************
102*** 1594,1599 ****
103--- 1604,1612 ----
104
105 for (k = clock_var; !(k->flags &EOV); k++)
106 {
107+ if (k->flags & PADDING)
108+ continue;
109+
110 i = strlen(k->text);
111 if (s+i+1 >= be)
112 break;
113***************
114*** 1605,1610 ****
115--- 1618,1626 ----
116
117 for (k = clock->kv_list; k && !(k->flags &EOV); k++)
118 {
119+ if (k->flags & PADDING)
120+ continue;
121+
122 ss = k->text;
123 if (!ss)
124 continue;
125--
126 Frank Kardel (kardel@informatik.uni-erlangen.de)
127 All SCSI disks will from now on be required to send an email
128 notice 24 hours prior to complete hardware failure!
129\ 1\ 1\ 1\ 1