diff options
| author | Terje Rosten <terje.rosten@oracle.com> | 2016-10-06 13:26:16 +0200 |
|---|---|---|
| committer | Terje Rosten <terje.rosten@oracle.com> | 2016-10-06 13:26:16 +0200 |
| commit | 1f93f4381b60e3a8012ba36a4dec920416073759 (patch) | |
| tree | 8eb803e39f255e9acaafd8ec835c04d3b8b6ce97 /scripts/CMakeLists.txt | |
| parent | 65febcce97ebe2da0c9723b76a041e249b053a98 (diff) | |
| download | mariadb-git-1f93f4381b60e3a8012ba36a4dec920416073759.tar.gz | |
Bug#24483092 UNSAFE USE OF VARIOUS SHELL UTILITIES
- Remove use of touch and chmod.
- Restrict usage of chown to cases where target directory is /var/log.
- Due to limited feature set in /bin/sh on Solaris, /bin/bash will be
used on this platform.
- Give error if directory for UNIX socket file is missing.
- Privileged user should not log to files owned by different user
(mysqld will log as before).
Diffstat (limited to 'scripts/CMakeLists.txt')
| -rw-r--r-- | scripts/CMakeLists.txt | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt index 05bf8530a26..920b6854334 100644 --- a/scripts/CMakeLists.txt +++ b/scripts/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (c) 2006, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2006, 2016, Oracle and/or its affiliates. All rights reserved. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -105,7 +105,13 @@ ELSE() ENDIF() IF(UNIX) - # FIND_PROC and CHECK_PID are used by mysqld_safe + # SHELL_PATH, FIND_PROC, CHECK_PID are used by mysqld_safe +IF(CMAKE_SYSTEM_NAME MATCHES "SunOS") + SET (SHELL_PATH "/bin/bash") +ELSE() + SET (SHELL_PATH "/bin/sh") +ENDIF() + IF(CMAKE_SYSTEM_NAME MATCHES "Linux") SET (FIND_PROC "ps wwwp $PID | grep -v mysqld_safe | grep -- $MYSQLD > /dev/null") |