|
 |
dc8c34 |
From 982e661b460fb2cfc9a039d29d77448f0badb885 Mon Sep 17 00:00:00 2001
|
|
|
dc8c34 |
From: Noriko Hosoi <nhosoi@redhat.com>
|
|
|
dc8c34 |
Date: Wed, 3 Jun 2015 15:02:40 -0700
|
|
|
dc8c34 |
Subject: [PATCH 331/333] Ticket #48148 - start/stop/restart-dirsrv utilities
|
|
|
dc8c34 |
should ignore admin-serv directory
|
|
|
dc8c34 |
|
|
|
dc8c34 |
Description: coverity defect
|
|
|
dc8c34 |
Defect type: SHELLCHECK_WARNING
|
|
|
dc8c34 |
/usr/sbin/start|stop|restart-dirsrv: warning: In POSIX sh, == is not supported.
|
|
|
dc8c34 |
Replacing
|
|
|
dc8c34 |
if [ $SERV_ID == "admin" ]; then
|
|
|
dc8c34 |
with
|
|
|
dc8c34 |
if [ "$SERV_ID" = "admin" ] ; then
|
|
|
dc8c34 |
|
|
|
dc8c34 |
https://fedorahosted.org/389/ticket/48148
|
|
|
dc8c34 |
(cherry picked from commit d49ef9b91ae60799e3c497a907d22400499b33f8)
|
|
|
dc8c34 |
---
|
|
|
dc8c34 |
ldap/admin/src/scripts/restart-dirsrv.in | 2 +-
|
|
|
dc8c34 |
ldap/admin/src/scripts/start-dirsrv.in | 2 +-
|
|
|
dc8c34 |
ldap/admin/src/scripts/stop-dirsrv.in | 2 +-
|
|
|
dc8c34 |
3 files changed, 3 insertions(+), 3 deletions(-)
|
|
|
dc8c34 |
|
|
|
dc8c34 |
diff --git a/ldap/admin/src/scripts/restart-dirsrv.in b/ldap/admin/src/scripts/restart-dirsrv.in
|
|
|
dc8c34 |
index 79fc1b1..87c9581 100644
|
|
|
dc8c34 |
--- a/ldap/admin/src/scripts/restart-dirsrv.in
|
|
|
dc8c34 |
+++ b/ldap/admin/src/scripts/restart-dirsrv.in
|
|
|
dc8c34 |
@@ -10,7 +10,7 @@
|
|
|
dc8c34 |
restart_instance() {
|
|
|
dc8c34 |
SERV_ID=$1
|
|
|
dc8c34 |
|
|
|
dc8c34 |
- if [ $SERV_ID == "admin" ]; then
|
|
|
dc8c34 |
+ if [ "$SERV_ID" = "admin" ] ; then
|
|
|
dc8c34 |
#ignore admin
|
|
|
dc8c34 |
return 0
|
|
|
dc8c34 |
fi
|
|
|
dc8c34 |
diff --git a/ldap/admin/src/scripts/start-dirsrv.in b/ldap/admin/src/scripts/start-dirsrv.in
|
|
|
dc8c34 |
index 4e36939..32fb7fa 100755
|
|
|
dc8c34 |
--- a/ldap/admin/src/scripts/start-dirsrv.in
|
|
|
dc8c34 |
+++ b/ldap/admin/src/scripts/start-dirsrv.in
|
|
|
dc8c34 |
@@ -19,7 +19,7 @@ start_instance() {
|
|
|
dc8c34 |
shift
|
|
|
dc8c34 |
|
|
|
dc8c34 |
# source env. for this instance
|
|
|
dc8c34 |
- if [ $SERV_ID == "admin" ] ; then
|
|
|
dc8c34 |
+ if [ "$SERV_ID" = "admin" ] ; then
|
|
|
dc8c34 |
# ignore admin
|
|
|
dc8c34 |
return 0
|
|
|
dc8c34 |
elif [ -f $initconfig_dir/dirsrv-$SERV_ID ] ; then
|
|
|
dc8c34 |
diff --git a/ldap/admin/src/scripts/stop-dirsrv.in b/ldap/admin/src/scripts/stop-dirsrv.in
|
|
|
dc8c34 |
index 15a84a4..8889ecc 100755
|
|
|
dc8c34 |
--- a/ldap/admin/src/scripts/stop-dirsrv.in
|
|
|
dc8c34 |
+++ b/ldap/admin/src/scripts/stop-dirsrv.in
|
|
|
dc8c34 |
@@ -10,7 +10,7 @@ stop_instance() {
|
|
|
dc8c34 |
SERV_ID=$1
|
|
|
dc8c34 |
|
|
|
dc8c34 |
# source env. for this instance
|
|
|
dc8c34 |
- if [ $SERV_ID == "admin" ] ; then
|
|
|
dc8c34 |
+ if [ "$SERV_ID" = "admin" ] ; then
|
|
|
dc8c34 |
# ignore admin
|
|
|
dc8c34 |
return 0
|
|
|
dc8c34 |
elif [ -f $initconfig_dir/dirsrv-$SERV_ID ] ; then
|
|
|
dc8c34 |
--
|
|
|
dc8c34 |
1.9.3
|
|
|
dc8c34 |
|