diff options
| author | Ted Trask <ttrask01@yahoo.com> | 2008-07-11 12:46:38 +0000 |
|---|---|---|
| committer | Ted Trask <ttrask01@yahoo.com> | 2008-07-11 12:46:38 +0000 |
| commit | 94ea0142e1ceed7ed876efaa18d34ffa75190a2f (patch) | |
| tree | 74a732b97dcb908f4f76931b543850784e9bb75e /openssl-controller.lua | |
| parent | a212499c9b3ca33a3f60398192e4998424e379e1 (diff) | |
| download | acf-openssl-94ea0142e1ceed7ed876efaa18d34ffa75190a2f.tar.bz2 acf-openssl-94ea0142e1ceed7ed876efaa18d34ffa75190a2f.tar.xz | |
Modified openssl to work with new cnf file. Distinguished names are no longer hard coded, but entirely based upon cnf file. Modified views to display password and certtype at end. Update to getopts fixes bug where setting defaults truncated the cnf file.
git-svn-id: svn://svn.alpinelinux.org/acf/openssl/trunk@1295 ab2d0c66-481e-0410-8bed-d214d4d58bed
Diffstat (limited to 'openssl-controller.lua')
| -rw-r--r-- | openssl-controller.lua | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/openssl-controller.lua b/openssl-controller.lua index 83cdf9e..be85ac6 100644 --- a/openssl-controller.lua +++ b/openssl-controller.lua @@ -13,7 +13,7 @@ mvc.pre_exec = function(self) if (sslstatus.value.version.errtxt and self.conf.action ~= "status") or (sslstatus.value.conffile.errtxt and self.conf.action ~= "status" and self.conf.action ~= "editconfigfile" and self.conf.action ~= "checkenvironment") or (sslstatus.value.environment.errtxt and self.conf.action ~= "status" and self.conf.action ~= "editconfigfile" and self.conf.action ~= "checkenvironment") - or ((sslstatus.value.cacert.errtxt or sslstatus.value.cakey.errtxt) and self.conf.action ~= "status" and self.conf.action ~= "editconfigfile" and self.conf.action ~= "putcacert" and self.conf.action ~= "generatecacert" and self.conf.action ~= "checkenvironment") + or ((sslstatus.value.cacert.errtxt or sslstatus.value.cakey.errtxt) and self.conf.action ~= "status" and self.conf.action ~= "editconfigfile" and self.conf.action ~= "putcacert" and self.conf.action ~= "generatecacert" and self.conf.action ~= "checkenvironment" and self.conf.action ~= "editdefaults") then redirect(self) end @@ -117,7 +117,7 @@ end -- Generate a self-signed CA generatecacert = function(self) - return controllerfunctions.handle_form(self, self.model.getnewcarequest, self.model.generateca, self.clientdata, "Generate", "Gererate CA Certificate", "Certificate Generated", "status") + return controllerfunctions.handle_form(self, self.model.getnewcarequest, self.model.generateca, self.clientdata, "Generate", "Generate CA Certificate", "Certificate Generated", "status") end editconfigfile = function(self) |