XFree86-Xserver_observe_XAUTHORITY.patch

   1 --- xc/programs/Xserver/dix/main.c~     Sat Jun 17 13:42:40 2000
   2 +++ xc/programs/Xserver/dix/main.c      Mon Oct 30 18:02:23 2000
   3 @@ -256,6 +256,7 @@
   4      char       *envp[];
   5  {
   6      int                i, j, k, error;
   7 +    char       *xauthfile;
   8      HWEventQueueType   alwaysCheckForInput[2];
   9
  10      /* Notice if we're restarted.  Probably this is because we jumped through
  11 @@ -279,6 +280,10 @@
  12      argcGlobal = argc;
  13      argvGlobal = argv;
  14      display = "0";
  15 +    /* prep X authority file from environment; this can be overriden by a
  16 +     * command line option */
  17 +    xauthfile = getenv("XAUTHORITY");
  18 +    if (xauthfile) InitAuthorization (xauthfile);
  19      ProcessCommandLine(argc, argv);
  20
  21      alwaysCheckForInput[0] = 0;
  22 @@ -286,7 +291,7 @@
  23      while(1)
  24      {
  25         serverGeneration++;
  26 -        ScreenSaverTime = defaultScreenSaverTime;
  27 +       ScreenSaverTime = defaultScreenSaverTime;
  28         ScreenSaverInterval = defaultScreenSaverInterval;
  29         ScreenSaverBlanking = defaultScreenSaverBlanking;
  30         ScreenSaverAllowExposures = defaultScreenSaverAllowExposures;