* cygcheck.cc (scan_registry): Open registry with read-only access.

(main): Reflect argument change for dump_setup.
* dump_setup.cc (dump_setup): Add preliminary extra argument for future use.
* path.cc (read_mounts): Open registry with read-only access.

1 files changed, 5 insertions, 5 deletions

diff --git a/winsup/utils/cygcheck.cc b/winsup/utils/cygcheck.cc
index 31d325f8e..db7132b21 100644
--- a/winsup/utils/cygcheck.cc
+++ b/winsup/utils/cygcheck.cc
@@ -33,7 +33,7 @@ typedef long long longlong;
 typedef __int64 longlong;
 #endif
 
-void dump_setup (int, char **);
+void dump_setup (int, char **, bool);
 
 const char *known_env_vars[] = {
   "c_include_path",
@@ -739,7 +739,7 @@ scan_registry (RegInfo * prev, HKEY hKey, char *name, int cygnus)
 	  ERROR_SUCCESS)
 	{
 	  HKEY sKey;
-	  if (RegOpenKeyEx (hKey, subkey_name, 0, KEY_ALL_ACCESS, &sKey)
+	  if (RegOpenKeyEx (hKey, subkey_name, 0, KEY_READ, &sKey)
 	      == ERROR_SUCCESS)
 	    {
 	      scan_registry (&ri, sKey, subkey_name, cygnus);
@@ -1270,7 +1270,7 @@ main (int argc, char **argv)
 
   if (check_setup)
     {
-      dump_setup (verbose, argv);
+      dump_setup (verbose, argv, true);
       puts ("");
     }
   else
@@ -1285,13 +1285,13 @@ main (int argc, char **argv)
       dump_sysinfo ();
       if (!check_setup)
 	{
-	  dump_setup (verbose, NULL);
+	  dump_setup (verbose, NULL, false);
 	  puts ("");
 	}
     }
 
   if (!givehelp)
-    printf ("Use -h to see help about each section\n");
+    puts ("Use -h to see help about each section");
 
   return 0;
 }