author | Brian Utterback <brian.utterback@oracle.com> |
Fri, 20 Sep 2013 08:55:17 -0700 | |
branch | s11-update |
changeset 2789 | b28fe4d7df32 |
permissions | -rw-r--r-- |
2789
b28fe4d7df32
15705382 SUNBT7031289 Update ntp to 4.2.7
Brian Utterback <brian.utterback@oracle.com>
parents:
diff
changeset
|
1 |
See: |
b28fe4d7df32
15705382 SUNBT7031289 Update ntp to 4.2.7
Brian Utterback <brian.utterback@oracle.com>
parents:
diff
changeset
|
2 |
|
b28fe4d7df32
15705382 SUNBT7031289 Update ntp to 4.2.7
Brian Utterback <brian.utterback@oracle.com>
parents:
diff
changeset
|
3 |
http://bugzilla.ntp.org/show_bug.cgi?id=2410 |
b28fe4d7df32
15705382 SUNBT7031289 Update ntp to 4.2.7
Brian Utterback <brian.utterback@oracle.com>
parents:
diff
changeset
|
4 |
|
b28fe4d7df32
15705382 SUNBT7031289 Update ntp to 4.2.7
Brian Utterback <brian.utterback@oracle.com>
parents:
diff
changeset
|
5 |
|
b28fe4d7df32
15705382 SUNBT7031289 Update ntp to 4.2.7
Brian Utterback <brian.utterback@oracle.com>
parents:
diff
changeset
|
6 |
--- ntpd/ntp_proto.c |
b28fe4d7df32
15705382 SUNBT7031289 Update ntp to 4.2.7
Brian Utterback <brian.utterback@oracle.com>
parents:
diff
changeset
|
7 |
+++ ntpd/ntp_proto.c |
b28fe4d7df32
15705382 SUNBT7031289 Update ntp to 4.2.7
Brian Utterback <brian.utterback@oracle.com>
parents:
diff
changeset
|
8 |
@@ -1856,23 +1856,27 @@ clock_update( |
b28fe4d7df32
15705382 SUNBT7031289 Update ntp to 4.2.7
Brian Utterback <brian.utterback@oracle.com>
parents:
diff
changeset
|
9 |
* Clock exceeds panic threshold. Life as we know it ends. |
b28fe4d7df32
15705382 SUNBT7031289 Update ntp to 4.2.7
Brian Utterback <brian.utterback@oracle.com>
parents:
diff
changeset
|
10 |
*/ |
b28fe4d7df32
15705382 SUNBT7031289 Update ntp to 4.2.7
Brian Utterback <brian.utterback@oracle.com>
parents:
diff
changeset
|
11 |
case -1: |
b28fe4d7df32
15705382 SUNBT7031289 Update ntp to 4.2.7
Brian Utterback <brian.utterback@oracle.com>
parents:
diff
changeset
|
12 |
+ msyslog(LOG_ERR, "Clock offset exceeds panic threshold."); |
b28fe4d7df32
15705382 SUNBT7031289 Update ntp to 4.2.7
Brian Utterback <brian.utterback@oracle.com>
parents:
diff
changeset
|
13 |
#ifdef HAVE_LIBSCF_H |
b28fe4d7df32
15705382 SUNBT7031289 Update ntp to 4.2.7
Brian Utterback <brian.utterback@oracle.com>
parents:
diff
changeset
|
14 |
/* |
b28fe4d7df32
15705382 SUNBT7031289 Update ntp to 4.2.7
Brian Utterback <brian.utterback@oracle.com>
parents:
diff
changeset
|
15 |
* For Solaris enter the maintenance mode. |
b28fe4d7df32
15705382 SUNBT7031289 Update ntp to 4.2.7
Brian Utterback <brian.utterback@oracle.com>
parents:
diff
changeset
|
16 |
*/ |
b28fe4d7df32
15705382 SUNBT7031289 Update ntp to 4.2.7
Brian Utterback <brian.utterback@oracle.com>
parents:
diff
changeset
|
17 |
if ((fmri = getenv("SMF_FMRI")) != NULL) { |
b28fe4d7df32
15705382 SUNBT7031289 Update ntp to 4.2.7
Brian Utterback <brian.utterback@oracle.com>
parents:
diff
changeset
|
18 |
if (smf_maintain_instance(fmri, 0) < 0) { |
b28fe4d7df32
15705382 SUNBT7031289 Update ntp to 4.2.7
Brian Utterback <brian.utterback@oracle.com>
parents:
diff
changeset
|
19 |
- printf("smf_maintain_instance: %s\n", |
b28fe4d7df32
15705382 SUNBT7031289 Update ntp to 4.2.7
Brian Utterback <brian.utterback@oracle.com>
parents:
diff
changeset
|
20 |
+ msyslog(LOG_ERR, "smf_maintain_instance: %s\n", |
b28fe4d7df32
15705382 SUNBT7031289 Update ntp to 4.2.7
Brian Utterback <brian.utterback@oracle.com>
parents:
diff
changeset
|
21 |
scf_strerror(scf_error())); |
b28fe4d7df32
15705382 SUNBT7031289 Update ntp to 4.2.7
Brian Utterback <brian.utterback@oracle.com>
parents:
diff
changeset
|
22 |
exit(1); |
b28fe4d7df32
15705382 SUNBT7031289 Update ntp to 4.2.7
Brian Utterback <brian.utterback@oracle.com>
parents:
diff
changeset
|
23 |
} |
b28fe4d7df32
15705382 SUNBT7031289 Update ntp to 4.2.7
Brian Utterback <brian.utterback@oracle.com>
parents:
diff
changeset
|
24 |
/* |
b28fe4d7df32
15705382 SUNBT7031289 Update ntp to 4.2.7
Brian Utterback <brian.utterback@oracle.com>
parents:
diff
changeset
|
25 |
* Sleep until SMF kills us. |
b28fe4d7df32
15705382 SUNBT7031289 Update ntp to 4.2.7
Brian Utterback <brian.utterback@oracle.com>
parents:
diff
changeset
|
26 |
*/ |
b28fe4d7df32
15705382 SUNBT7031289 Update ntp to 4.2.7
Brian Utterback <brian.utterback@oracle.com>
parents:
diff
changeset
|
27 |
+ msyslog(LOG_ERR, "%s placed into maintenance. " |
b28fe4d7df32
15705382 SUNBT7031289 Update ntp to 4.2.7
Brian Utterback <brian.utterback@oracle.com>
parents:
diff
changeset
|
28 |
+ "Set system clock by hand before clearing.", fmri); |
b28fe4d7df32
15705382 SUNBT7031289 Update ntp to 4.2.7
Brian Utterback <brian.utterback@oracle.com>
parents:
diff
changeset
|
29 |
for (;;) |
b28fe4d7df32
15705382 SUNBT7031289 Update ntp to 4.2.7
Brian Utterback <brian.utterback@oracle.com>
parents:
diff
changeset
|
30 |
pause(); |
b28fe4d7df32
15705382 SUNBT7031289 Update ntp to 4.2.7
Brian Utterback <brian.utterback@oracle.com>
parents:
diff
changeset
|
31 |
} |
b28fe4d7df32
15705382 SUNBT7031289 Update ntp to 4.2.7
Brian Utterback <brian.utterback@oracle.com>
parents:
diff
changeset
|
32 |
#endif /* HAVE_LIBSCF_H */ |
b28fe4d7df32
15705382 SUNBT7031289 Update ntp to 4.2.7
Brian Utterback <brian.utterback@oracle.com>
parents:
diff
changeset
|
33 |
+ msyslog(LOG_ERR, "Set system clock by hand."); |
b28fe4d7df32
15705382 SUNBT7031289 Update ntp to 4.2.7
Brian Utterback <brian.utterback@oracle.com>
parents:
diff
changeset
|
34 |
exit (-1); |
b28fe4d7df32
15705382 SUNBT7031289 Update ntp to 4.2.7
Brian Utterback <brian.utterback@oracle.com>
parents:
diff
changeset
|
35 |
/* not reached */ |
b28fe4d7df32
15705382 SUNBT7031289 Update ntp to 4.2.7
Brian Utterback <brian.utterback@oracle.com>
parents:
diff
changeset
|
36 |