From 4c794a56f80f639867e90dd586cbf213ffa09e05 Mon Sep 17 00:00:00 2001
From: Florian Schaal <florian@schaal-24.de>
Date: Thu, 7 Aug 2014 08:07:02 +0200
Subject: [PATCH] Suppress output from exec
---
interface/web/mail/mail_domain_dkim_create.php | 6 +++---
server/plugins-available/mail_plugin_dkim.inc.php | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/interface/web/mail/mail_domain_dkim_create.php b/interface/web/mail/mail_domain_dkim_create.php
index 2a486a7db7..0f636b12db 100644
--- a/interface/web/mail/mail_domain_dkim_create.php
+++ b/interface/web/mail/mail_domain_dkim_create.php
@@ -80,7 +80,7 @@ function get_public_key($private_key) {
require_once('../../lib/classes/validate_dkim.inc.php');
$validate_dkim=new validate_dkim ();
if($validate_dkim->validate_post('private',$private_key)) { /* validate the $_POST-value */
- exec('echo '.escapeshellarg($private_key).'|openssl rsa -pubout -outform PEM',$pubkey,$result);
+ exec('echo '.escapeshellarg($private_key).'|openssl rsa -pubout -outform PEM 2> /dev/null',$pubkey,$result);
$public_key=pub_key($pubkey);
} else {
$public_key='invalid key';
@@ -92,8 +92,8 @@ $_POST=getRealPOST();
switch ($_POST['action']) {
case 'create': /* create DKIM Private-key */
- exec('openssl rand -out /usr/local/ispconfig/server/temp/random-data.bin 4096', $output, $result);
- exec('openssl genrsa -rand /usr/local/ispconfig/server/temp/random-data.bin 1024', $privkey, $result);
+ exec('openssl rand -out /usr/local/ispconfig/server/temp/random-data.bin 4096 2> /dev/null', $output, $result);
+ exec('openssl genrsa -rand /usr/local/ispconfig/server/temp/random-data.bin 1024 2> /dev/null', $privkey, $result);
unlink("/usr/local/ispconfig/server/temp/random-data.bin");
foreach($privkey as $values) $private_key=$private_key.$values."\n";
break;
diff --git a/server/plugins-available/mail_plugin_dkim.inc.php b/server/plugins-available/mail_plugin_dkim.inc.php
index e07dfe8af0..0767427d13 100644
--- a/server/plugins-available/mail_plugin_dkim.inc.php
+++ b/server/plugins-available/mail_plugin_dkim.inc.php
@@ -181,7 +181,7 @@ class mail_plugin_dkim {
$app->log('Saved DKIM Private-key to '.$key_file.'.private', LOGLEVEL_DEBUG);
$success=true;
/* now we get the DKIM Public-key */
- exec('cat '.escapeshellarg($key_file.'.private').'|openssl rsa -pubout', $pubkey, $result);
+ exec('cat '.escapeshellarg($key_file.'.private').'|openssl rsa -pubout 2> /dev/null', $pubkey, $result);
$public_key='';
foreach($pubkey as $values) $public_key=$public_key.$values."\n";
/* save the DKIM Public-key in dkim-dir */
--
GitLab