Support file specification in a dataset starting with './' and '../' in addition to '/'. Update man pages to indicate it is general and not just fo KeyTable*.

This commit is contained in:
Scott Kitterman
2019-10-30 13:56:59 -04:00
parent 1337ac1e1a
commit 9c9ab7d5d0
3 changed files with 6 additions and 3 deletions
+1 -1
View File
@@ -278,7 +278,7 @@ def _dataset_to_list(dataset):
# This is a flat file dataset, which are key value:value stores
ds = []
dsd = {}
if dataset[0] == '/':
if dataset[0] == '/' or dataset[:2] == './' or dataset[:3] == '../':
dsname = dataset
elif dataset[:5] == 'file:':
dsname = dataset[5:]
+1 -1
View File
@@ -175,7 +175,7 @@ def read_keytable(tabledict, milterconfig):
import dkim
import syslog
for dictkey, values in tabledict.items():
if values[-1][:1] == '/':
if values[-1][:1] == '/' or values[-1][:2] == './' or values[-1][:3] == '../':
key = read_keyfile(values[-1], milterconfig)
tabledict[dictkey] = [values[0], values[1], key]
return tabledict