usr/src/cmd/ntpd/Patches/60-exit-message.patch
author Jon Tibble <meths@btinternet.com>
Fri, 17 Jan 2014 19:32:42 +0000
branchoi_151a
changeset 252 600924158051
permissions -rw-r--r--
Bump ntpd to 4.2.7p411
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
252
600924158051 Bump ntpd to 4.2.7p411
Jon Tibble <meths@btinternet.com>
parents:
diff changeset
     1
See: 
600924158051 Bump ntpd to 4.2.7p411
Jon Tibble <meths@btinternet.com>
parents:
diff changeset
     2
600924158051 Bump ntpd to 4.2.7p411
Jon Tibble <meths@btinternet.com>
parents:
diff changeset
     3
	http://bugzilla.ntp.org/show_bug.cgi?id=2410
600924158051 Bump ntpd to 4.2.7p411
Jon Tibble <meths@btinternet.com>
parents:
diff changeset
     4
600924158051 Bump ntpd to 4.2.7p411
Jon Tibble <meths@btinternet.com>
parents:
diff changeset
     5
600924158051 Bump ntpd to 4.2.7p411
Jon Tibble <meths@btinternet.com>
parents:
diff changeset
     6
--- ntpd/ntp_proto.c
600924158051 Bump ntpd to 4.2.7p411
Jon Tibble <meths@btinternet.com>
parents:
diff changeset
     7
+++ ntpd/ntp_proto.c
600924158051 Bump ntpd to 4.2.7p411
Jon Tibble <meths@btinternet.com>
parents:
diff changeset
     8
@@ -1856,23 +1856,27 @@ clock_update(
600924158051 Bump ntpd to 4.2.7p411
Jon Tibble <meths@btinternet.com>
parents:
diff changeset
     9
 	 * Clock exceeds panic threshold. Life as we know it ends.
600924158051 Bump ntpd to 4.2.7p411
Jon Tibble <meths@btinternet.com>
parents:
diff changeset
    10
 	 */
600924158051 Bump ntpd to 4.2.7p411
Jon Tibble <meths@btinternet.com>
parents:
diff changeset
    11
 	case -1:
600924158051 Bump ntpd to 4.2.7p411
Jon Tibble <meths@btinternet.com>
parents:
diff changeset
    12
+		msyslog(LOG_ERR, "Clock offset exceeds panic threshold.");
600924158051 Bump ntpd to 4.2.7p411
Jon Tibble <meths@btinternet.com>
parents:
diff changeset
    13
 #ifdef HAVE_LIBSCF_H
600924158051 Bump ntpd to 4.2.7p411
Jon Tibble <meths@btinternet.com>
parents:
diff changeset
    14
 		/*
600924158051 Bump ntpd to 4.2.7p411
Jon Tibble <meths@btinternet.com>
parents:
diff changeset
    15
 		 * For Solaris enter the maintenance mode.
600924158051 Bump ntpd to 4.2.7p411
Jon Tibble <meths@btinternet.com>
parents:
diff changeset
    16
 		 */
600924158051 Bump ntpd to 4.2.7p411
Jon Tibble <meths@btinternet.com>
parents:
diff changeset
    17
 		if ((fmri = getenv("SMF_FMRI")) != NULL) {
600924158051 Bump ntpd to 4.2.7p411
Jon Tibble <meths@btinternet.com>
parents:
diff changeset
    18
 			if (smf_maintain_instance(fmri, 0) < 0) {
600924158051 Bump ntpd to 4.2.7p411
Jon Tibble <meths@btinternet.com>
parents:
diff changeset
    19
-				printf("smf_maintain_instance: %s\n",
600924158051 Bump ntpd to 4.2.7p411
Jon Tibble <meths@btinternet.com>
parents:
diff changeset
    20
+				msyslog(LOG_ERR, "smf_maintain_instance: %s\n",
600924158051 Bump ntpd to 4.2.7p411
Jon Tibble <meths@btinternet.com>
parents:
diff changeset
    21
 				    scf_strerror(scf_error()));
600924158051 Bump ntpd to 4.2.7p411
Jon Tibble <meths@btinternet.com>
parents:
diff changeset
    22
 				exit(1);
600924158051 Bump ntpd to 4.2.7p411
Jon Tibble <meths@btinternet.com>
parents:
diff changeset
    23
 			}
600924158051 Bump ntpd to 4.2.7p411
Jon Tibble <meths@btinternet.com>
parents:
diff changeset
    24
 			/*
600924158051 Bump ntpd to 4.2.7p411
Jon Tibble <meths@btinternet.com>
parents:
diff changeset
    25
 			 * Sleep until SMF kills us.
600924158051 Bump ntpd to 4.2.7p411
Jon Tibble <meths@btinternet.com>
parents:
diff changeset
    26
 			 */
600924158051 Bump ntpd to 4.2.7p411
Jon Tibble <meths@btinternet.com>
parents:
diff changeset
    27
+			msyslog(LOG_ERR, "%s placed into maintenance. "
600924158051 Bump ntpd to 4.2.7p411
Jon Tibble <meths@btinternet.com>
parents:
diff changeset
    28
+			    "Set system clock by hand before clearing.", fmri);
600924158051 Bump ntpd to 4.2.7p411
Jon Tibble <meths@btinternet.com>
parents:
diff changeset
    29
 			for (;;)
600924158051 Bump ntpd to 4.2.7p411
Jon Tibble <meths@btinternet.com>
parents:
diff changeset
    30
 				pause();
600924158051 Bump ntpd to 4.2.7p411
Jon Tibble <meths@btinternet.com>
parents:
diff changeset
    31
 		}
600924158051 Bump ntpd to 4.2.7p411
Jon Tibble <meths@btinternet.com>
parents:
diff changeset
    32
 #endif /* HAVE_LIBSCF_H */
600924158051 Bump ntpd to 4.2.7p411
Jon Tibble <meths@btinternet.com>
parents:
diff changeset
    33
+		msyslog(LOG_ERR, "Set system clock by hand.");
600924158051 Bump ntpd to 4.2.7p411
Jon Tibble <meths@btinternet.com>
parents:
diff changeset
    34
 		exit (-1);
600924158051 Bump ntpd to 4.2.7p411
Jon Tibble <meths@btinternet.com>
parents:
diff changeset
    35
 		/* not reached */
600924158051 Bump ntpd to 4.2.7p411
Jon Tibble <meths@btinternet.com>
parents:
diff changeset
    36