# Copyright (c) 2006, 2013, Oracle and/or its affiliates. All rights reserved.

#

# Permission is hereby granted, free of charge, to any person obtaining a

# copy of this software and associated documentation files (the "Software"),

# to deal in the Software without restriction, including without limitation

# the rights to use, copy, modify, merge, publish, distribute, sublicense,

# and/or sell copies of the Software, and to permit persons to whom the

# Software is furnished to do so, subject to the following conditions:

#

# The above copyright notice and this permission notice (including the next

# paragraph) shall be included in all copies or substantial portions of the

# Software.

#

# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL

# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING

# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER

# DEALINGS IN THE SOFTWARE.

--- a/os/utils.c

+++ b/os/utils.c

@@ -523,8 +523,10 @@

ErrorF("-ls int limit stack space to N Kb\n");

#endif

#ifdef LOCK_SERVER

+#ifndef SUNSOFT /* Not in Sun version as required by PSARC 2004/187 TCR */

ErrorF("-nolock disable the locking mechanism\n");

#endif

+#endif

ErrorF("-nolisten string don't listen on protocol\n");

ErrorF("-noreset don't reset after last client exists\n");

ErrorF("-background [none] create root window with no background\n");

@@ -768,6 +770,7 @@

}

#endif

#ifdef LOCK_SERVER

+#ifndef SUNSOFT /* Not in Sun version as required by PSARC 2004/187 TCR */

else if (strcmp(argv[i], "-nolock") == 0) {

#if !defined(WIN32) && !defined(__CYGWIN__)

if (getuid() != 0)

@@ -778,6 +781,7 @@

nolock = TRUE;

}

#endif

+#endif

#ifdef SUNSOFT

else if (strcmp(argv[i], "-nobanner") == 0) {

/* ignore - just maintaining compatibility with Xsun CLI */