summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Tänzer <neo@nhng.de>2013-08-07 03:05:31 +0200
committerMichael Tänzer <neo@nhng.de>2013-08-07 03:05:31 +0200
commita733a971db70514c5f791193d9c49bd44f1d4def (patch)
tree074df25cb40d4a8bc8f0462299ac3e0b2cfccaec
parent359e6dac12f900ffecb74230f671951cf054101a (diff)
downloadcacert-devel-a733a971db70514c5f791193d9c49bd44f1d4def.tar.gz
cacert-devel-a733a971db70514c5f791193d9c49bd44f1d4def.tar.xz
cacert-devel-a733a971db70514c5f791193d9c49bd44f1d4def.zip
bug 1200: Doh, STDOUT is the *third* parameter of runCommand()
Signed-off-by: Michael Tänzer <neo@nhng.de>
-rw-r--r--www/gpg.php11
1 files changed, 9 insertions, 2 deletions
diff --git a/www/gpg.php b/www/gpg.php
index 241df30..d1c67e0 100644
--- a/www/gpg.php
+++ b/www/gpg.php
@@ -83,8 +83,15 @@ function verifyEmail($email)
$state=0;
if($oldid == "0" && $CSR != "")
{
- $err = runCommand('mktemp --directory /tmp/cacert_gpg.XXXXXXXXXX', $tmpdir);
- if (!err && $tmpdir)
+ $err = runCommand('mktemp --directory /tmp/cacert_gpg.XXXXXXXXXX',
+ "",
+ $tmpdir);
+ if (!$tmpdir)
+ {
+ $err = true;
+ }
+
+ if (!err)
{
$err = runCommand("gpg --with-colons --homedir $tmpdir 2>&1",
clean_gpgcsr($CSR),