cli-nolock.patch revision 1366
1276N/A# Copyright (c) 2006, 2012, Oracle and/or its affiliates. All rights reserved.
98N/A#
98N/A# Permission is hereby granted, free of charge, to any person obtaining a
919N/A# copy of this software and associated documentation files (the "Software"),
919N/A# to deal in the Software without restriction, including without limitation
919N/A# the rights to use, copy, modify, merge, publish, distribute, sublicense,
919N/A# and/or sell copies of the Software, and to permit persons to whom the
919N/A# Software is furnished to do so, subject to the following conditions:
919N/A#
919N/A# The above copyright notice and this permission notice (including the next
919N/A# paragraph) shall be included in all copies or substantial portions of the
919N/A# Software.
919N/A#
919N/A# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
919N/A# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
919N/A# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
919N/A# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
919N/A# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
919N/A# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
919N/A# DEALINGS IN THE SOFTWARE.
1276N/A
1124N/A--- a/os/utils.c
1124N/A+++ b/os/utils.c
1366N/A@@ -523,8 +523,10 @@
98N/A ErrorF("-ls int limit stack space to N Kb\n");
98N/A #endif
1366N/A #ifdef LOCK_SERVER
98N/A+#ifndef SUNSOFT /* Not in Sun version as required by PSARC 2004/187 TCR */
98N/A ErrorF("-nolock disable the locking mechanism\n");
1366N/A #endif
98N/A+#endif
1124N/A ErrorF("-nolisten string don't listen on protocol\n");
1124N/A ErrorF("-noreset don't reset after last client exists\n");
1124N/A ErrorF("-background [none] create root window with no background\n");
1366N/A@@ -768,6 +770,7 @@
1276N/A }
98N/A #endif
1366N/A #ifdef LOCK_SERVER
98N/A+#ifndef SUNSOFT /* Not in Sun version as required by PSARC 2004/187 TCR */
1276N/A else if (strcmp(argv[i], "-nolock") == 0) {
1088N/A #if !defined(WIN32) && !defined(__CYGWIN__)
1276N/A if (getuid() != 0)
1366N/A@@ -778,6 +781,7 @@
1276N/A nolock = TRUE;
1276N/A }
1366N/A #endif
98N/A+#endif
1366N/A #ifdef SUNSOFT
1366N/A else if (strcmp(argv[i], "-nobanner") == 0) {
1366N/A /* ignore - just maintaining compatibility with Xsun CLI */