components/ntp/patches/60-exit-message.patch
author Brian Utterback <brian.utterback@oracle.com>
Tue, 15 Jul 2014 07:20:42 -0700
branchs11u2-sru
changeset 3221 e863b2da18cb
parent 2789 b28fe4d7df32
permissions -rw-r--r--
18287627 ntpd sometimes logs unexpected getifaddrs errors

See: 

	http://bugzilla.ntp.org/show_bug.cgi?id=2410


--- ntpd/ntp_proto.c
+++ ntpd/ntp_proto.c
@@ -1856,23 +1856,27 @@ clock_update(
 	 * Clock exceeds panic threshold. Life as we know it ends.
 	 */
 	case -1:
+		msyslog(LOG_ERR, "Clock offset exceeds panic threshold.");
 #ifdef HAVE_LIBSCF_H
 		/*
 		 * For Solaris enter the maintenance mode.
 		 */
 		if ((fmri = getenv("SMF_FMRI")) != NULL) {
 			if (smf_maintain_instance(fmri, 0) < 0) {
-				printf("smf_maintain_instance: %s\n",
+				msyslog(LOG_ERR, "smf_maintain_instance: %s\n",
 				    scf_strerror(scf_error()));
 				exit(1);
 			}
 			/*
 			 * Sleep until SMF kills us.
 			 */
+			msyslog(LOG_ERR, "%s placed into maintenance. "
+			    "Set system clock by hand before clearing.", fmri);
 			for (;;)
 				pause();
 		}
 #endif /* HAVE_LIBSCF_H */
+		msyslog(LOG_ERR, "Set system clock by hand.");
 		exit (-1);
 		/* not reached */