equal
deleted
inserted
replaced
43 ! caller, file_name(), line |
43 ! caller, file_name(), line |
44 ! ); |
44 ! ); |
45 break; |
45 break; |
46 default: |
46 default: |
47 msyslog(LOG_NOTICE, "%s: %s line %d: unhandled errno value %d after failed ntp_adjtime call", |
47 msyslog(LOG_NOTICE, "%s: %s line %d: unhandled errno value %d after failed ntp_adjtime call", |
48 --- 264,284 ---- |
48 --- 264,285 ---- |
49 ); |
49 ); |
50 break; |
50 break; |
51 case EPERM: |
51 case EPERM: |
|
52 ! case ENOTSUP: |
52 ! if (!eperm_count) { |
53 ! if (!eperm_count) { |
53 ! if (tai_call) { |
54 ! if (tai_call) { |
54 ! errno = saved_errno; |
55 ! errno = saved_errno; |
55 ! msyslog(LOG_ERR, |
56 ! msyslog(LOG_ERR, |
56 ! "%s: ntp_adjtime(TAI) failed: %m", |
57 ! "%s: ntp_adjtime(TAI) failed: %m", |
123 + } |
124 + } |
124 if (adjtv.tv_sec != 0 || adjtv.tv_usec != 0) { |
125 if (adjtv.tv_sec != 0 || adjtv.tv_usec != 0) { |
125 ! /* After a few tries, give up */ |
126 ! /* After a few tries, give up */ |
126 ! if (eperm_count < 10) { |
127 ! if (eperm_count < 10) { |
127 ! if (adjtime(&adjtv, &oadjtv) < 0) { |
128 ! if (adjtime(&adjtv, &oadjtv) < 0) { |
128 ! if (errno == EPERM) { |
129 ! if (errno == EPERM || errno == ENOTSUP) { |
129 ! if (!eperm_count) { |
130 ! if (!eperm_count) { |
130 ! msyslog(LOG_ERR, |
131 ! msyslog(LOG_ERR, |
131 ! "adj_systime: %m"); |
132 ! "adj_systime: %m"); |
132 ! } |
133 ! } |
133 ! eperm_count++; |
134 ! eperm_count++; |
154 } |
155 } |
155 --- 457,466 ---- |
156 --- 457,466 ---- |
156 |
157 |
157 /* now set new system time */ |
158 /* now set new system time */ |
158 if (ntp_set_tod(&timetv, NULL) != 0) { |
159 if (ntp_set_tod(&timetv, NULL) != 0) { |
159 ! if (errno == EPERM && !eperm_count) { |
160 ! if ((errno == EPERM || errno == ENOTSUP) && !eperm_count) { |
160 ! msyslog(LOG_ERR, "step-systime: %m"); |
161 ! msyslog(LOG_ERR, "step-systime: %m"); |
161 ! eperm_count++; |
162 ! eperm_count++; |
162 ! } |
163 ! } |
163 if (enable_panic_check && allow_panic) { |
164 if (enable_panic_check && allow_panic) { |
164 msyslog(LOG_ERR, "step_systime: allow_panic is TRUE!"); |
165 msyslog(LOG_ERR, "step_systime: allow_panic is TRUE!"); |