1 --- ntpd/ntpd-opts.c.orig Thu Jul 29 09:29:51 2010 |
|
2 +++ ntpd/ntpd-opts.c Thu Jul 29 09:43:40 2010 |
|
3 @@ -243,6 +243,24 @@ |
|
4 #define NOVIRTUALIPS_FLAGS (OPTST_DISABLED) |
|
5 |
|
6 /* |
|
7 + * Mdns option description: |
|
8 + */ |
|
9 +#ifdef HAVE_DNSREGISTRATION |
|
10 +tSCC zMdnsText[] = |
|
11 + "Register with mDNS as a NTP server"; |
|
12 +tSCC zMdns_NAME[] = "MDNS"; |
|
13 +tSCC zMdns_Name[] = "mdns"; |
|
14 +#define MDNS_FLAGS (OPTST_DISABLED) |
|
15 + |
|
16 +#else /* disable Mdns */ |
|
17 +#define VALUE_OPT_MDNS NO_EQUIVALENT |
|
18 +#define MDNS_FLAGS (OPTST_OMITTED | OPTST_NO_INIT) |
|
19 +#define zMdnsText NULL |
|
20 +#define zMdns_NAME NULL |
|
21 +#define zMdns_Name NULL |
|
22 +#endif /* HAVE_DNSREGISTRATION */ |
|
23 + |
|
24 +/* |
|
25 * Modifymmtimer option description: |
|
26 */ |
|
27 #ifdef SYS_WINNT |
|
28 @@ -673,10 +691,22 @@ |
|
29 /* desc, NAME, name */ zNovirtualipsText, zNovirtualips_NAME, zNovirtualips_Name, |
|
30 /* disablement strs */ NULL, NULL }, |
|
31 |
|
32 - { /* entry idx, value */ 15, VALUE_OPT_MODIFYMMTIMER, |
|
33 - /* equiv idx, value */ 15, VALUE_OPT_MODIFYMMTIMER, |
|
34 + { /* entry idx, value */ 15, VALUE_OPT_MDNS, |
|
35 + /* equiv idx, value */ 15, VALUE_OPT_MDNS, |
|
36 /* equivalenced to */ NO_EQUIVALENT, |
|
37 /* min, max, act ct */ 0, 1, 0, |
|
38 + /* opt state flags */ MDNS_FLAGS, 0, |
|
39 + /* last opt argumnt */ { NULL }, |
|
40 + /* arg list/cookie */ NULL, |
|
41 + /* must/cannot opts */ NULL, NULL, |
|
42 + /* option proc */ NULL, |
|
43 + /* desc, NAME, name */ zMdnsText, zMdns_NAME, zMdns_Name, |
|
44 + /* disablement strs */ NULL, NULL }, |
|
45 + |
|
46 + { /* entry idx, value */ 16, VALUE_OPT_MODIFYMMTIMER, |
|
47 + /* equiv idx, value */ 16, VALUE_OPT_MODIFYMMTIMER, |
|
48 + /* equivalenced to */ NO_EQUIVALENT, |
|
49 + /* min, max, act ct */ 0, 1, 0, |
|
50 /* opt state flags */ MODIFYMMTIMER_FLAGS, 0, |
|
51 /* last opt argumnt */ { NULL }, |
|
52 /* arg list/cookie */ NULL, |
|
53 @@ -685,8 +715,8 @@ |
|
54 /* desc, NAME, name */ zModifymmtimerText, zModifymmtimer_NAME, zModifymmtimer_Name, |
|
55 /* disablement strs */ NULL, NULL }, |
|
56 |
|
57 - { /* entry idx, value */ 16, VALUE_OPT_NOFORK, |
|
58 - /* equiv idx, value */ 16, VALUE_OPT_NOFORK, |
|
59 + { /* entry idx, value */ 17, VALUE_OPT_NOFORK, |
|
60 + /* equiv idx, value */ 17, VALUE_OPT_NOFORK, |
|
61 /* equivalenced to */ NO_EQUIVALENT, |
|
62 /* min, max, act ct */ 0, 1, 0, |
|
63 /* opt state flags */ NOFORK_FLAGS, 0, |
|
64 @@ -697,8 +727,8 @@ |
|
65 /* desc, NAME, name */ zNoforkText, zNofork_NAME, zNofork_Name, |
|
66 /* disablement strs */ NULL, NULL }, |
|
67 |
|
68 - { /* entry idx, value */ 17, VALUE_OPT_NICE, |
|
69 - /* equiv idx, value */ 17, VALUE_OPT_NICE, |
|
70 + { /* entry idx, value */ 18, VALUE_OPT_NICE, |
|
71 + /* equiv idx, value */ 18, VALUE_OPT_NICE, |
|
72 /* equivalenced to */ NO_EQUIVALENT, |
|
73 /* min, max, act ct */ 0, 1, 0, |
|
74 /* opt state flags */ NICE_FLAGS, 0, |
|
75 @@ -709,8 +739,8 @@ |
|
76 /* desc, NAME, name */ zNiceText, zNice_NAME, zNice_Name, |
|
77 /* disablement strs */ NULL, NULL }, |
|
78 |
|
79 - { /* entry idx, value */ 18, VALUE_OPT_PIDFILE, |
|
80 - /* equiv idx, value */ 18, VALUE_OPT_PIDFILE, |
|
81 + { /* entry idx, value */ 19, VALUE_OPT_PIDFILE, |
|
82 + /* equiv idx, value */ 19, VALUE_OPT_PIDFILE, |
|
83 /* equivalenced to */ NO_EQUIVALENT, |
|
84 /* min, max, act ct */ 0, 1, 0, |
|
85 /* opt state flags */ PIDFILE_FLAGS, 0, |
|
86 @@ -721,8 +751,8 @@ |
|
87 /* desc, NAME, name */ zPidfileText, zPidfile_NAME, zPidfile_Name, |
|
88 /* disablement strs */ NULL, NULL }, |
|
89 |
|
90 - { /* entry idx, value */ 19, VALUE_OPT_PRIORITY, |
|
91 - /* equiv idx, value */ 19, VALUE_OPT_PRIORITY, |
|
92 + { /* entry idx, value */ 20, VALUE_OPT_PRIORITY, |
|
93 + /* equiv idx, value */ 20, VALUE_OPT_PRIORITY, |
|
94 /* equivalenced to */ NO_EQUIVALENT, |
|
95 /* min, max, act ct */ 0, 1, 0, |
|
96 /* opt state flags */ PRIORITY_FLAGS, 0, |
|
97 @@ -733,8 +763,8 @@ |
|
98 /* desc, NAME, name */ zPriorityText, zPriority_NAME, zPriority_Name, |
|
99 /* disablement strs */ NULL, NULL }, |
|
100 |
|
101 - { /* entry idx, value */ 20, VALUE_OPT_QUIT, |
|
102 - /* equiv idx, value */ 20, VALUE_OPT_QUIT, |
|
103 + { /* entry idx, value */ 21, VALUE_OPT_QUIT, |
|
104 + /* equiv idx, value */ 21, VALUE_OPT_QUIT, |
|
105 /* equivalenced to */ NO_EQUIVALENT, |
|
106 /* min, max, act ct */ 0, 1, 0, |
|
107 /* opt state flags */ QUIT_FLAGS, 0, |
|
108 @@ -745,8 +775,8 @@ |
|
109 /* desc, NAME, name */ zQuitText, zQuit_NAME, zQuit_Name, |
|
110 /* disablement strs */ NULL, NULL }, |
|
111 |
|
112 - { /* entry idx, value */ 21, VALUE_OPT_PROPAGATIONDELAY, |
|
113 - /* equiv idx, value */ 21, VALUE_OPT_PROPAGATIONDELAY, |
|
114 + { /* entry idx, value */ 22, VALUE_OPT_PROPAGATIONDELAY, |
|
115 + /* equiv idx, value */ 22, VALUE_OPT_PROPAGATIONDELAY, |
|
116 /* equivalenced to */ NO_EQUIVALENT, |
|
117 /* min, max, act ct */ 0, 1, 0, |
|
118 /* opt state flags */ PROPAGATIONDELAY_FLAGS, 0, |
|
119 @@ -757,8 +787,8 @@ |
|
120 /* desc, NAME, name */ zPropagationdelayText, zPropagationdelay_NAME, zPropagationdelay_Name, |
|
121 /* disablement strs */ NULL, NULL }, |
|
122 |
|
123 - { /* entry idx, value */ 22, VALUE_OPT_STATSDIR, |
|
124 - /* equiv idx, value */ 22, VALUE_OPT_STATSDIR, |
|
125 + { /* entry idx, value */ 23, VALUE_OPT_STATSDIR, |
|
126 + /* equiv idx, value */ 23, VALUE_OPT_STATSDIR, |
|
127 /* equivalenced to */ NO_EQUIVALENT, |
|
128 /* min, max, act ct */ 0, 1, 0, |
|
129 /* opt state flags */ STATSDIR_FLAGS, 0, |
|
130 @@ -769,8 +799,8 @@ |
|
131 /* desc, NAME, name */ zStatsdirText, zStatsdir_NAME, zStatsdir_Name, |
|
132 /* disablement strs */ NULL, NULL }, |
|
133 |
|
134 - { /* entry idx, value */ 23, VALUE_OPT_TRUSTEDKEY, |
|
135 - /* equiv idx, value */ 23, VALUE_OPT_TRUSTEDKEY, |
|
136 + { /* entry idx, value */ 24, VALUE_OPT_TRUSTEDKEY, |
|
137 + /* equiv idx, value */ 24, VALUE_OPT_TRUSTEDKEY, |
|
138 /* equivalenced to */ NO_EQUIVALENT, |
|
139 /* min, max, act ct */ 0, NOLIMIT, 0, |
|
140 /* opt state flags */ TRUSTEDKEY_FLAGS, 0, |
|
141 @@ -781,8 +811,8 @@ |
|
142 /* desc, NAME, name */ zTrustedkeyText, zTrustedkey_NAME, zTrustedkey_Name, |
|
143 /* disablement strs */ NULL, NULL }, |
|
144 |
|
145 - { /* entry idx, value */ 24, VALUE_OPT_USER, |
|
146 - /* equiv idx, value */ 24, VALUE_OPT_USER, |
|
147 + { /* entry idx, value */ 25, VALUE_OPT_USER, |
|
148 + /* equiv idx, value */ 25, VALUE_OPT_USER, |
|
149 /* equivalenced to */ NO_EQUIVALENT, |
|
150 /* min, max, act ct */ 0, 1, 0, |
|
151 /* opt state flags */ USER_FLAGS, 0, |
|
152 @@ -793,8 +823,8 @@ |
|
153 /* desc, NAME, name */ zUserText, zUser_NAME, zUser_Name, |
|
154 /* disablement strs */ NULL, NULL }, |
|
155 |
|
156 - { /* entry idx, value */ 25, VALUE_OPT_UPDATEINTERVAL, |
|
157 - /* equiv idx, value */ 25, VALUE_OPT_UPDATEINTERVAL, |
|
158 + { /* entry idx, value */ 26, VALUE_OPT_UPDATEINTERVAL, |
|
159 + /* equiv idx, value */ 26, VALUE_OPT_UPDATEINTERVAL, |
|
160 /* equivalenced to */ NO_EQUIVALENT, |
|
161 /* min, max, act ct */ 0, 1, 0, |
|
162 /* opt state flags */ UPDATEINTERVAL_FLAGS, 0, |
|
163 @@ -805,8 +835,8 @@ |
|
164 /* desc, NAME, name */ zUpdateintervalText, zUpdateinterval_NAME, zUpdateinterval_Name, |
|
165 /* disablement strs */ NULL, NULL }, |
|
166 |
|
167 - { /* entry idx, value */ 26, VALUE_OPT_VAR, |
|
168 - /* equiv idx, value */ 26, VALUE_OPT_VAR, |
|
169 + { /* entry idx, value */ 27, VALUE_OPT_VAR, |
|
170 + /* equiv idx, value */ 27, VALUE_OPT_VAR, |
|
171 /* equivalenced to */ NO_EQUIVALENT, |
|
172 /* min, max, act ct */ 0, NOLIMIT, 0, |
|
173 /* opt state flags */ VAR_FLAGS, 0, |
|
174 @@ -817,8 +847,8 @@ |
|
175 /* desc, NAME, name */ zVarText, zVar_NAME, zVar_Name, |
|
176 /* disablement strs */ NULL, NULL }, |
|
177 |
|
178 - { /* entry idx, value */ 27, VALUE_OPT_DVAR, |
|
179 - /* equiv idx, value */ 27, VALUE_OPT_DVAR, |
|
180 + { /* entry idx, value */ 28, VALUE_OPT_DVAR, |
|
181 + /* equiv idx, value */ 28, VALUE_OPT_DVAR, |
|
182 /* equivalenced to */ NO_EQUIVALENT, |
|
183 /* min, max, act ct */ 0, NOLIMIT, 0, |
|
184 /* opt state flags */ DVAR_FLAGS, 0, |
|
185 @@ -829,8 +859,8 @@ |
|
186 /* desc, NAME, name */ zDvarText, zDvar_NAME, zDvar_Name, |
|
187 /* disablement strs */ NULL, NULL }, |
|
188 |
|
189 - { /* entry idx, value */ 28, VALUE_OPT_SLEW, |
|
190 - /* equiv idx, value */ 28, VALUE_OPT_SLEW, |
|
191 + { /* entry idx, value */ 29, VALUE_OPT_SLEW, |
|
192 + /* equiv idx, value */ 29, VALUE_OPT_SLEW, |
|
193 /* equivalenced to */ NO_EQUIVALENT, |
|
194 /* min, max, act ct */ 0, 1, 0, |
|
195 /* opt state flags */ SLEW_FLAGS, 0, |
|
196 @@ -967,7 +997,7 @@ |
|
197 NO_EQUIVALENT, /* '-#' option index */ |
|
198 NO_EQUIVALENT /* index of default opt */ |
|
199 }, |
|
200 - 34 /* full option count */, 31 /* user option count */, |
|
201 + 35 /* full option count */, 32 /* user option count */, |
|
202 ntpd_full_usage, ntpd_short_usage, |
|
203 NULL, NULL |
|
204 }; |
|
205 --- ntpd/ntpd.c.orig Wed Aug 12 04:07:05 2009 |
|
206 +++ ntpd/ntpd.c Thu Jul 29 09:48:44 2010 |
|
207 @@ -166,7 +166,7 @@ |
|
208 * after we have synched the first time. If the attempt fails, then try again once per |
|
209 * minute for up to 5 times. After all, we may be starting before mDNS. |
|
210 */ |
|
211 -int mdnsreg = 1; |
|
212 +int mdnsreg = 0; |
|
213 int mdnstries = 5; |
|
214 #endif /* HAVE_DNSREGISTRATION */ |
|
215 |
|
216 @@ -540,6 +540,9 @@ |
|
217 if (HAVE_OPT( NOVIRTUALIPS )) |
|
218 listen_to_virtual_ips = 0; |
|
219 |
|
220 + if (HAVE_OPT( MDNS )) |
|
221 + mdnsreg = 1; |
|
222 + |
|
223 /* |
|
224 * Limit specific interfaces |
|
225 */ |
|
226 --- ntpd/ntpd-opts.h.orig Wed Aug 12 04:42:23 2009 |
|
227 +++ ntpd/ntpd-opts.h Thu Jul 29 09:39:13 2010 |
|
228 @@ -67,28 +67,29 @@ |
|
229 INDEX_OPT_KEYFILE = 12, |
|
230 INDEX_OPT_LOGFILE = 13, |
|
231 INDEX_OPT_NOVIRTUALIPS = 14, |
|
232 - INDEX_OPT_MODIFYMMTIMER = 15, |
|
233 - INDEX_OPT_NOFORK = 16, |
|
234 - INDEX_OPT_NICE = 17, |
|
235 - INDEX_OPT_PIDFILE = 18, |
|
236 - INDEX_OPT_PRIORITY = 19, |
|
237 - INDEX_OPT_QUIT = 20, |
|
238 - INDEX_OPT_PROPAGATIONDELAY = 21, |
|
239 - INDEX_OPT_STATSDIR = 22, |
|
240 - INDEX_OPT_TRUSTEDKEY = 23, |
|
241 - INDEX_OPT_USER = 24, |
|
242 - INDEX_OPT_UPDATEINTERVAL = 25, |
|
243 - INDEX_OPT_VAR = 26, |
|
244 - INDEX_OPT_DVAR = 27, |
|
245 - INDEX_OPT_SLEW = 28, |
|
246 - INDEX_OPT_USEPCC = 29, |
|
247 - INDEX_OPT_PCCFREQ = 30, |
|
248 - INDEX_OPT_VERSION = 31, |
|
249 - INDEX_OPT_HELP = 32, |
|
250 - INDEX_OPT_MORE_HELP = 33 |
|
251 + INDEX_OPT_MDNS = 15, |
|
252 + INDEX_OPT_MODIFYMMTIMER = 16, |
|
253 + INDEX_OPT_NOFORK = 17, |
|
254 + INDEX_OPT_NICE = 18, |
|
255 + INDEX_OPT_PIDFILE = 19, |
|
256 + INDEX_OPT_PRIORITY = 20, |
|
257 + INDEX_OPT_QUIT = 21, |
|
258 + INDEX_OPT_PROPAGATIONDELAY = 22, |
|
259 + INDEX_OPT_STATSDIR = 23, |
|
260 + INDEX_OPT_TRUSTEDKEY = 24, |
|
261 + INDEX_OPT_USER = 25, |
|
262 + INDEX_OPT_UPDATEINTERVAL = 26, |
|
263 + INDEX_OPT_VAR = 27, |
|
264 + INDEX_OPT_DVAR = 28, |
|
265 + INDEX_OPT_SLEW = 29, |
|
266 + INDEX_OPT_USEPCC = 30, |
|
267 + INDEX_OPT_PCCFREQ = 31, |
|
268 + INDEX_OPT_VERSION = 32, |
|
269 + INDEX_OPT_HELP = 33, |
|
270 + INDEX_OPT_MORE_HELP = 34 |
|
271 } teOptIndex; |
|
272 |
|
273 -#define OPTION_CT 34 |
|
274 +#define OPTION_CT 35 |
|
275 #define NTPD_VERSION "4.2.5p200" |
|
276 #define NTPD_FULL_VERSION "ntpd - NTP daemon program - Ver. 4.2.5p200" |
|
277 |
|
278 @@ -177,6 +178,10 @@ |
|
279 # warning undefining NOVIRTUALIPS due to option name conflict |
|
280 # undef NOVIRTUALIPS |
|
281 # endif |
|
282 +# ifdef MDNS |
|
283 +# warning undefining MDNS due to option name conflict |
|
284 +# undef MDNS |
|
285 +# endif |
|
286 # ifdef MODIFYMMTIMER |
|
287 # warning undefining MODIFYMMTIMER due to option name conflict |
|
288 # undef MODIFYMMTIMER |
|
289 @@ -257,6 +262,7 @@ |
|
290 # undef KEYFILE |
|
291 # undef LOGFILE |
|
292 # undef NOVIRTUALIPS |
|
293 +# undef MDNS |
|
294 # undef MODIFYMMTIMER |
|
295 # undef NOFORK |
|
296 # undef NICE |
|
297 @@ -302,6 +308,9 @@ |
|
298 #define VALUE_OPT_KEYFILE 'k' |
|
299 #define VALUE_OPT_LOGFILE 'l' |
|
300 #define VALUE_OPT_NOVIRTUALIPS 'L' |
|
301 +#ifdef HAVE_DNSREGISTRATION |
|
302 +#define VALUE_OPT_MDNS 'm' |
|
303 +#endif /* HAVE_DNSREGISTRATION */ |
|
304 #ifdef SYS_WINNT |
|
305 #define VALUE_OPT_MODIFYMMTIMER 'M' |
|
306 #endif /* SYS_WINNT */ |
|
307 @@ -319,8 +328,8 @@ |
|
308 #endif /* HAVE_DROPROOT */ |
|
309 #define VALUE_OPT_UPDATEINTERVAL 'U' |
|
310 #define OPT_VALUE_UPDATEINTERVAL (DESC(UPDATEINTERVAL).optArg.argInt) |
|
311 -#define VALUE_OPT_VAR 26 |
|
312 -#define VALUE_OPT_DVAR 27 |
|
313 +#define VALUE_OPT_VAR 27 |
|
314 +#define VALUE_OPT_DVAR 28 |
|
315 #define VALUE_OPT_SLEW 'x' |
|
316 #ifdef SYS_WINNT |
|
317 #define VALUE_OPT_USEPCC 29 |
|