25438095 Fix for 24660275 was incomplete.
authorBrian Utterback <brian.utterback@oracle.com>
Wed, 25 Jan 2017 16:29:14 -0800
changeset 7606 0bea82fa40c9
parent 7605 f554ed236404
child 7607 a7732f4f1376
25438095 Fix for 24660275 was incomplete.
components/ntp/patches/80-eperm.patch
--- a/components/ntp/patches/80-eperm.patch	Wed Jan 25 16:38:34 2017 -0800
+++ b/components/ntp/patches/80-eperm.patch	Wed Jan 25 16:29:14 2017 -0800
@@ -45,10 +45,11 @@
   		    break;
   		    default:
   			msyslog(LOG_NOTICE, "%s: %s line %d: unhandled errno value %d after failed ntp_adjtime call",
---- 264,284 ----
+--- 264,285 ----
   			);
   		    break;
   		    case EPERM:
+! 		    case ENOTSUP:
 ! 		    	if (!eperm_count) {
 ! 				if (tai_call) {
 ! 				    errno = saved_errno;
@@ -125,7 +126,7 @@
 ! 		/* After a few tries, give up */
 ! 		if (eperm_count < 10) {
 ! 			if (adjtime(&adjtv, &oadjtv) < 0) {
-! 				if (errno == EPERM) {
+! 				if (errno == EPERM || errno == ENOTSUP) {
 ! 				       	if (!eperm_count) {
 ! 						msyslog(LOG_ERR,
 ! 						    "adj_systime: %m");
@@ -156,7 +157,7 @@
   
   	/* now set new system time */
   	if (ntp_set_tod(&timetv, NULL) != 0) {
-! 		if (errno == EPERM && !eperm_count) {
+! 		if ((errno == EPERM || errno == ENOTSUP) && !eperm_count) {
 ! 			msyslog(LOG_ERR, "step-systime: %m");
 ! 			eperm_count++;
 ! 		}