Merge pull request #32 from ancorgs/bnc937837

Calls to sntp adjusted to the syntax of ntp 4.2.8 (bnc#937837)
yast · Jul 20, 2015 · aafefd3 · aafefd3
2 parents f6e1544 + c21af42
commit aafefd3
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 15 deletions.
diff --git a/package/yast2-ntp-client.changes b/package/yast2-ntp-client.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Mon Jul 20 10:38:30 UTC 2015 - ancor@suse.com
+
+- Calls to sntp adjusted to the syntax of ntp 4.2.8
+  (bnc#937837, bnc#916617)
+- 3.1.16
+
 -------------------------------------------------------------------
 Fri Jun 26 11:34:00 UTC 2015 - jreidinger@suse.com
 

diff --git a/package/yast2-ntp-client.spec b/package/yast2-ntp-client.spec
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-ntp-client
-Version:        3.1.15
+Version:        3.1.16
 Release:        0
 Summary:        YaST2 - NTP Client Configuration
 License:        GPL-2.0+

diff --git a/src/clients/ntp-client_proposal.rb b/src/clients/ntp-client_proposal.rb
@@ -399,12 +399,13 @@ def Write(param)
 
         Builtins.y2milestone("Running sntp to sync with %1", ntp_server)
 
-        # -s: do set the system time
+        # -S: do set the system time
         # -t 5: timeout of 5 seconds
         # -l <file>: log to a file to not mess text mode installation
+        # -c: causes all IP addresses to which ntp_server resolves to be queried in parallel
         ret = SCR.Execute(
                 path(".target.bash"),
-                "/usr/sbin/sntp -l /var/log/YaST2/sntp.log -t 5 -s '#{String.Quote(ntp_server)}'"
+                "/usr/sbin/sntp -S -l /var/log/YaST2/sntp.log -t 5 -c '#{String.Quote(ntp_server)}'"
               )
         Builtins.y2milestone("'sntp %1' returned %2", ntp_server, ret)
         Popup.ClearFeedback

diff --git a/src/modules/NtpClient.rb b/src/modules/NtpClient.rb
@@ -1078,20 +1078,11 @@ def TestNtpServer(server, verbosity)
 
       # testing the server using IPv4 and then using IPv6 protocol
       # bug #74076, Firewall could have been blocked IPv6
-      ret_IPv4 = Convert.to_integer(
-        SCR.Execute(
-          path(".target.bash"),
-          Builtins.sformat("/usr/sbin/sntp -4 -t 5 %1", server)
-        )
-      )
+      # -c: concurrently query all IPs; -t 5: five seconds of timeout
+      ret_IPv4 = SCR.Execute(path(".target.bash"), "/usr/sbin/sntp -4 -t 5 -c #{server}")
       ret_IPv6 = 0
       if ret_IPv4 != 0
-        ret_IPv6 = Convert.to_integer(
-          SCR.Execute(
-            path(".target.bash"),
-            Builtins.sformat("/usr/sbin/sntp -6 -t 5 %1", server)
-          )
-        )
+        ret_IPv6 = SCR.Execute(path(".target.bash"), "/usr/sbin/sntp -6 -t 5 -c #{server}")
       end
 
       UI.CloseDialog if verbosity != :no_ui