[Git][NTPsec/ntpsec][master] Temporary fix for ntpsnmp.conf problems.

[Ian Bruene]

Ian Bruene pushed to branch master at NTPsec / ntpsec


Commits:
efb16dd4 by Ian Bruene at 2018-03-13T20:18:18Z
Temporary fix for ntpsnmp.conf problems.

- - - - -


2 changed files:

- docs/includes/ntpsnmpd-body.txt
- ntpclients/ntpsnmpd.py


Changes:

=====================================
docs/includes/ntpsnmpd-body.txt
=====================================
--- a/docs/includes/ntpsnmpd-body.txt
+++ b/docs/includes/ntpsnmpd-body.txt
@@ -8,6 +8,8 @@
 
 == Description ==
 
++[experimental]+
+
 +ntpsnmpd+ is an AgentX Simple Network Management Protocol sub-agent.
 
 It functions as a bridge between the Mode 6 protocol used for Network
@@ -34,6 +36,9 @@ running NTP and SNMP daemons for ntpsnmpd to work.
   Print the version string and exit.
 
 == Configuration Files ==
+  Note that filenames in the options should be enclosed in quotes.
+  This is a temporary measure that will not be the case in future
+  versions.
 
 === /etc/ntpsnmpd.conf ===
 


=====================================
ntpclients/ntpsnmpd.py
=====================================
--- a/ntpclients/ntpsnmpd.py
+++ b/ntpclients/ntpsnmpd.py
@@ -1199,7 +1199,10 @@ def loadSettings(filename, optionList):
         dataLen = len(data)
         while i < dataLen:
             if data[i] in optionList:
-                options[data[i]] = data[i+1]
+                arg = data[i+1]
+                if arg[0] in "\"'":
+                    arg = arg[1:-1]
+                options[data[i]] = arg
                 i += 1
             i += 1
     return options



View it on GitLab: https://gitlab.com/NTPsec/ntpsec/commit/efb16dd4fa1113c9a986b64864b39a2d9052745d

---
View it on GitLab: https://gitlab.com/NTPsec/ntpsec/commit/efb16dd4fa1113c9a986b64864b39a2d9052745d
You're receiving this email because of your account on gitlab.com.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.ntpsec.org/pipermail/vc/attachments/20180313/f2803499/attachment.html>