From 2e08d2c0e9bede644be993ddaa28157c9f156c10 Mon Sep 17 00:00:00 2001
From: Violette Roche-Montane <violette.roche-montane@forgerock.com>
Date: Tue, 07 May 2013 13:50:59 +0000
Subject: [PATCH] svn merge https://svn.forgerock.org/opendj/trunk/opends@8851 https://svn.forgerock.org/opendj/branches/native-packaging@8851 .

---
 opends/resource/bin/control-panel |   12 +-----------
 1 files changed, 1 insertions(+), 11 deletions(-)

diff --git a/opends/resource/bin/control-panel b/opends/resource/bin/control-panel
index 0d090ed..e14e531 100644
--- a/opends/resource/bin/control-panel
+++ b/opends/resource/bin/control-panel
@@ -24,7 +24,7 @@
 #
 #
 #      Copyright 2008 Sun Microsystems, Inc.
-#      Portions Copyright 2011 ForgeRock AS
+#      Portions Copyright 2011-2013 ForgeRock AS
 
 
 # This script may be used to display the control panel.
@@ -34,15 +34,5 @@
 SCRIPT_NAME="control-panel"
 export SCRIPT_NAME
 
-NO_CHECK=0
-for i in $*
-do
-  if [ "$i" == "-r" ] || [ "$i" == "--remote" ]
-  then
-    NO_CHECK=1
-  fi
-done
-export NO_CHECK
-
 SCRIPT_DIR=`dirname "${0}"`
 "${SCRIPT_DIR}/../lib/_client-script.sh" "${@}"

--
Gitblit v1.10.0