/*

 * Copyright (c) 2009, 2010, 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.

 */

diff --git xscreensaver-5.11/driver/prefs.c xscreensaver-5.11/driver/prefs.c

--- xscreensaver-5.11/driver/prefs.c

+++ xscreensaver-5.11/driver/prefs.c

@@ -382,7 +382,21 @@ parse_init_file (saver_preferences *p)

       return 0;

     }

+  /*

+   * 6859039: unprivileged local users can use xscreensaver to show

+   * contents of files they don't have permission to read.

+   */

+

+  /* Drop Privilege before opening .xscreensaver file */

+  uid_t idorg = geteuid ();

+  if (seteuid (getuid ()) != 0)

+    return 0;

+

   in = fopen(name, "r");

+

+  /* Restore Privilege */

+  seteuid (idorg);

+

   if (!in)

     {

       char *buf = (char *) malloc(1024 + strlen(name));