.gitlab-opttest-ci.yml

@@ -126,7 +126,7 @@ freebsd-options-tester:
   script:
     - apt-get update
     - apt-get install -y netbase bison gcc libssl-dev libcap-dev pps-tools python2-dev python2-minimal libseccomp-dev bash pkg-config python3-dev python3-minimal
-    - PYTHON=python bash tests/option-tester.sh
+    - PYTHON=python2 bash tests/option-tester.sh
     - PYTHON=python3 bash tests/option-tester.sh
   tags:
     - gitlab-org

NEWS.adoc

@@ -12,6 +12,8 @@ on user-visible changes.
 
 ## Repository Head
 
+* Update ntpsnmpd to use python built-in to get uname information. NTPsec/ntpsec#791
+
 * Update license file names for REUSE compliance.
 
 * Fix ntploggps issue where count_used_satellites checked before it is initialized.

ntpclients/ntpsnmpd.py

@@ -8,7 +8,6 @@ import os
 import getopt
 import time
 import socket
-import subprocess
 
 try:
     import ntp.packet
@@ -193,9 +192,9 @@ class DataSource(ntp.agentx.MIBControl):
         elif category == "vendor":  # vendor/author name
             data = "Internet Civil Engineering Institute"
         elif category == "system":  # system / hardware info
-            proc = subprocess.Popen(["uname", "-srm"],
-                                    stdout=subprocess.PIPE)
-            data = proc.communicate()[0]
+            # Extract sysname, release, machine from os.uname() tuple
+            uname = os.uname()
+            data = " ".join([uname[0], uname[2], uname[4]])
         vb = ax.Varbind(ax.VALUE_OCTET_STR, oid, data)
         return vb