components/x11/xorg-server/patches/24-cli-nolock.patch

   1 # Copyright (c) 2006, 2012, Oracle and/or its affiliates. All rights reserved.
   2 #
   3 # Permission is hereby granted, free of charge, to any person obtaining a
   4 # copy of this software and associated documentation files (the "Software"),
   5 # to deal in the Software without restriction, including without limitation
   6 # the rights to use, copy, modify, merge, publish, distribute, sublicense,
   7 # and/or sell copies of the Software, and to permit persons to whom the
   8 # Software is furnished to do so, subject to the following conditions:
   9 #
  10 # The above copyright notice and this permission notice (including the next
  11 # paragraph) shall be included in all copies or substantial portions of the
  12 # Software.
  13 #
  14 # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  15 # IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  16 # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
  17 # THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  18 # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  19 # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  20 # DEALINGS IN THE SOFTWARE.
  21
  22 --- a/os/utils.c
  23 +++ b/os/utils.c
  24 @@ -558,8 +558,10 @@
  25      ErrorF("-ls int                limit stack space to N Kb\n");
  26  #endif
  27  #ifdef LOCK_SERVER
  28 +#ifndef SUNSOFT /* Not in Sun version as required by PSARC 2004/187 TCR */
  29      ErrorF("-nolock                disable the locking mechanism\n");
  30  #endif
  31 +#endif
  32      ErrorF("-maxclients n          set maximum number of clients (power of two)\n");
  33      ErrorF("-nolisten string       don't listen on protocol\n");
  34      ErrorF("-listen string         listen on protocol\n");
  35 @@ -855,6 +857,7 @@
  36          }
  37  #endif
  38  #ifdef LOCK_SERVER
  39 +#ifndef SUNSOFT /* Not in Sun version as required by PSARC 2004/187 TCR */
  40          else if (strcmp(argv[i], "-nolock") == 0) {
  41  #if !defined(WIN32) && !defined(__CYGWIN__)
  42              if (getuid() != 0)
  43 @@ -865,6 +868,7 @@
  44                  nolock = TRUE;
  45          }
  46  #endif
  47 +#endif
  48         else if ( strcmp( argv[i], "-maxclients") == 0)
  49         {
  50             if (++i < argc) {