summaryrefslogtreecommitdiff
path: root/packaging
diff options
context:
space:
mode:
authorTerje Rosten <terje.rosten@oracle.com>2016-08-12 12:38:20 +0200
committerTerje Rosten <terje.rosten@oracle.com>2016-08-18 12:19:15 +0200
commit8b1f4d84cafe393e92f942278f9f020a62ceb5b9 (patch)
treef8165953bb4a392b6ce368da8090a27e0a95a432 /packaging
parent04bad164e7d4bad2b2ed63485ea6361029392d68 (diff)
downloadmariadb-git-8b1f4d84cafe393e92f942278f9f020a62ceb5b9.tar.gz
Bug#24464380 PRIVILEGE ESCALATION USING MYSQLD_SAFE
Argument to malloc-lib must be included in restricted list of directories, symlink guards added, and mysqld and mysqld-version options restricted to command line only. Don't redirect errors to stderr.
Diffstat (limited to 'packaging')
-rw-r--r--packaging/rpm-oel/mysql.init2
-rw-r--r--packaging/rpm-sles/mysql.init2
2 files changed, 2 insertions, 2 deletions
diff --git a/packaging/rpm-oel/mysql.init b/packaging/rpm-oel/mysql.init
index 262d0582f68..aaea498d153 100644
--- a/packaging/rpm-oel/mysql.init
+++ b/packaging/rpm-oel/mysql.init
@@ -102,7 +102,7 @@ start(){
# alarms, per bug #547485
$exec --datadir="$datadir" --socket="$socketfile" \
--pid-file="$mypidfile" \
- --basedir=/usr --user=mysql >/dev/null 2>&1 &
+ --basedir=/usr --user=mysql >/dev/null &
safe_pid=$!
# Spin for a maximum of N seconds waiting for the server to come up;
# exit the loop immediately if mysqld_safe process disappears.
diff --git a/packaging/rpm-sles/mysql.init b/packaging/rpm-sles/mysql.init
index 50ca4c9033c..dda0bebba56 100644
--- a/packaging/rpm-sles/mysql.init
+++ b/packaging/rpm-sles/mysql.init
@@ -137,7 +137,7 @@ start () {
rc_failed 6 ; rc_status -v ; rc_exit
fi
- $PROG --basedir=/usr --datadir="$datadir" --pid-file="$pidfile" >/dev/null 2>&1 &
+ $PROG --basedir=/usr --datadir="$datadir" --pid-file="$pidfile" >/dev/null &
if pinger $! ; then
echo -n "Starting service MySQL:"
touch $lockfile