diff options
| author | Ron Yorston <rmy@pobox.com> | 2019-05-27 11:56:52 +0100 |
|---|---|---|
| committer | Ron Yorston <rmy@pobox.com> | 2019-05-27 11:56:52 +0100 |
| commit | a61949401890cbb33a9d6c4571b51c53460ad438 (patch) | |
| tree | 64dedaddb89896d5b1670a421af123670ca2120b /networking/ntpd.c | |
| parent | 03a7b173605a890e1db5177ecd5b8dd591081c41 (diff) | |
| parent | bcb1fc3e6ca6fe902610f507eaf9b0b58a5c583a (diff) | |
| download | busybox-w32-a61949401890cbb33a9d6c4571b51c53460ad438.tar.gz busybox-w32-a61949401890cbb33a9d6c4571b51c53460ad438.tar.bz2 busybox-w32-a61949401890cbb33a9d6c4571b51c53460ad438.zip | |
Merge branch 'busybox' into merge
Diffstat (limited to 'networking/ntpd.c')
| -rw-r--r-- | networking/ntpd.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/networking/ntpd.c b/networking/ntpd.c index 027cfe783..cd6da2b38 100644 --- a/networking/ntpd.c +++ b/networking/ntpd.c | |||
| @@ -1130,7 +1130,7 @@ step_time(double offset) | |||
| 1130 | } | 1130 | } |
| 1131 | tval = tvn.tv_sec; | 1131 | tval = tvn.tv_sec; |
| 1132 | strftime_YYYYMMDDHHMMSS(buf, sizeof(buf), &tval); | 1132 | strftime_YYYYMMDDHHMMSS(buf, sizeof(buf), &tval); |
| 1133 | bb_error_msg("setting time to %s.%06u (offset %+fs)", buf, (unsigned)tvn.tv_usec, offset); | 1133 | bb_info_msg("setting time to %s.%06u (offset %+fs)", buf, (unsigned)tvn.tv_usec, offset); |
| 1134 | //maybe? G.FREQHOLD_cnt = 0; | 1134 | //maybe? G.FREQHOLD_cnt = 0; |
| 1135 | 1135 | ||
| 1136 | /* Correct various fields which contain time-relative values: */ | 1136 | /* Correct various fields which contain time-relative values: */ |
| @@ -2132,7 +2132,7 @@ recv_and_process_peer_pkt(peer_t *p) | |||
| 2132 | 2132 | ||
| 2133 | p->reachable_bits |= 1; | 2133 | p->reachable_bits |= 1; |
| 2134 | if ((MAX_VERBOSE && G.verbose) || (option_mask32 & OPT_w)) { | 2134 | if ((MAX_VERBOSE && G.verbose) || (option_mask32 & OPT_w)) { |
| 2135 | bb_error_msg("reply from %s: offset:%+f delay:%f status:0x%02x strat:%d refid:0x%08x rootdelay:%f reach:0x%02x", | 2135 | bb_info_msg("reply from %s: offset:%+f delay:%f status:0x%02x strat:%d refid:0x%08x rootdelay:%f reach:0x%02x", |
| 2136 | p->p_dotted, | 2136 | p->p_dotted, |
| 2137 | offset, | 2137 | offset, |
| 2138 | p->p_raw_delay, | 2138 | p->p_raw_delay, |