IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2025-02-25 18:55:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

ipa client: use NTP servers specified by user

Browse Source 
NTP servers specified by user should be used to synchronize time.

https://fedorahosted.org/freeipa/ticket/4983

Reviewed-By: Martin Babinsky <mbabinsk@redhat.com>
This commit is contained in:
Martin Basti 2015-04-15 15:06:45 +02:00 committed by Petr Vobornik
parent e55d8ee5d4
commit 2c8c4b8c88
1 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
ipa-client/ipa-install/ipa-client-install
View File

@ -2350,19 +2350,25 @@ def install(options, env, fstore, statestore):
ntp_srv_servers = ds.ipadns_search_srv(cli_domain, '_ntp._udp', ntp_srv_servers = ds.ipadns_search_srv(cli_domain, '_ntp._udp',
None, break_on_first=False) None, break_on_first=False)
synced_ntp = False synced_ntp = False
if ntp_srv_servers: ntp_servers = ntp_srv_servers
for s in ntp_srv_servers:
synced_ntp = ipaclient.ntpconf.synconce_ntp(s) # use user specified NTP servers if there are any
if synced_ntp: if options.ntp_servers:
break ntp_servers = options.ntp_servers
if not synced_ntp:
for s in ntp_servers:
synced_ntp = ipaclient.ntpconf.synconce_ntp(s)
if synced_ntp:
break
if not synced_ntp and not options.ntp_servers:
synced_ntp = ipaclient.ntpconf.synconce_ntp(cli_server[0]) synced_ntp = ipaclient.ntpconf.synconce_ntp(cli_server[0])
if not synced_ntp: if not synced_ntp:
root_logger.warning("Unable to sync time with IPA NTP " + root_logger.warning("Unable to sync time with NTP " +
"server, assuming the time is in sync. Please check " + "server, assuming the time is in sync. Please check " +
"that 123 UDP port is opened.") "that 123 UDP port is opened.")
else: else:
root_logger.info('Skipping synchronizing time with IPA NTP server.') root_logger.info('Skipping synchronizing time with NTP server.')
if not options.unattended: if not options.unattended:
if (options.principal is None and options.password is None and if (options.principal is None and options.password is None and
@ -2854,7 +2860,7 @@ def install(options, env, fstore, statestore):
if options.force_ntpd: if options.force_ntpd:
ipaclient.ntpconf.force_ntpd(statestore) ipaclient.ntpconf.force_ntpd(statestore)
if options.ntp_server: if options.ntp_servers:
ntp_servers = options.ntp_servers ntp_servers = options.ntp_servers
elif ntp_srv_servers: elif ntp_srv_servers:
ntp_servers = ntp_srv_servers ntp_servers = ntp_srv_servers