summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTed Trask <ttrask01@yahoo.com>2015-02-02 11:25:41 -0500
committerTed Trask <ttrask01@yahoo.com>2015-02-02 11:25:41 -0500
commita7f4aa9054875f4fdce090afcecdf858c9cc2746 (patch)
tree5c2ac0b27b429409d6c64db12f9fa59727015310
parent55eadf121752afb389e1ce432c2ed5fc1874088d (diff)
downloadacf-openssl-a7f4aa9054875f4fdce090afcecdf858c9cc2746.tar.bz2
acf-openssl-a7f4aa9054875f4fdce090afcecdf858c9cc2746.tar.xz
Some bugfixes to make basedir work
-rw-r--r--openssl-model.lua6
1 files changed, 3 insertions, 3 deletions
diff --git a/openssl-model.lua b/openssl-model.lua
index edafbd7..4806d9d 100644
--- a/openssl-model.lua
+++ b/openssl-model.lua
@@ -33,10 +33,10 @@ local ca_mandatory_entries = { "new_certs_dir", "certificate", "private_key", "d
local initializecfe = function(self, clientdata, label)
local retval = cfe({ type="group", value={}, label=label or "" })
- retval.value.basedir = cfe({ label="Base Directory", key=true })
+ retval.value.basedir = cfe({ type="hidden", label="Base Directory", key=true })
self.handle_clientdata(retval, clientdata)
if retval.value.basedir.value ~= "" then
- openssldir = retval.value.basedir.value
+ openssldir = posix.dirname(retval.value.basedir.value.."/tmp").."/"
end
return retval
end
@@ -957,7 +957,7 @@ mymodule.getconfigfile = function(self, clientdata)
local retval = initializecfe(self, clientdata, "")
local retval2 = modelfunctions.getfiledetails(openssldir..configfile)
for name,value in pairs(retval.value) do
- retval2.value.name = value
+ retval2.value[name] = value
end
return retval2
end