* fhandler_disk_file.cc (fhandler_disk_file::facl): Fix whitespace.

	* external.cc: Update copyright.
	* fhandler.cc: Ditto.
	* sec_helper.cc: Ditto.
	* security.h: Ditto.
	* security.cc: Ditto.
	(check_registry_access): Return -1 if W_OK is requested.

7 files changed, 21 insertions, 6 deletions

diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index de219c637..c89a434b1 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,5 +1,15 @@
 2006-10-22  Corinna Vinschen  <corinna@vinschen.de>
 
+	* fhandler_disk_file.cc (fhandler_disk_file::facl): Fix whitespace.
+	* external.cc: Update copyright.
+	* fhandler.cc: Ditto.
+	* sec_helper.cc: Ditto.
+	* security.h: Ditto.
+	* security.cc: Ditto.
+	(check_registry_access): Return -1 if W_OK is requested.
+
+2006-10-22  Corinna Vinschen  <corinna@vinschen.de>
+
 	* external.cc (cygwin_internal): Use security_descriptor::copy method.
 	* sec_helper.cc (security_descriptor::malloc): Use own free method.
 	Set type.
diff --git a/winsup/cygwin/external.cc b/winsup/cygwin/external.cc
index cbfda931e..757cd276c 100644
--- a/winsup/cygwin/external.cc
+++ b/winsup/cygwin/external.cc
@@ -1,6 +1,7 @@
 /* external.cc: Interface to Cygwin internals from external programs.
 
-   Copyright 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 Red Hat, Inc.
+   Copyright 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
+   2006 Red Hat, Inc.
 
    Written by Christopher Faylor <cgf@cygnus.com>
 
diff --git a/winsup/cygwin/fhandler.cc b/winsup/cygwin/fhandler.cc
index 64669da87..7bce1b2f9 100644
--- a/winsup/cygwin/fhandler.cc
+++ b/winsup/cygwin/fhandler.cc
@@ -1,7 +1,7 @@
 /* fhandler.cc.  See console.cc for fhandler_console functions.
 
    Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-   2005 Red Hat, Inc.
+   2005, 2006 Red Hat, Inc.
 
 This file is part of Cygwin.
 
diff --git a/winsup/cygwin/fhandler_disk_file.cc b/winsup/cygwin/fhandler_disk_file.cc
index a930d3c67..26a97f602 100644
--- a/winsup/cygwin/fhandler_disk_file.cc
+++ b/winsup/cygwin/fhandler_disk_file.cc
@@ -689,7 +689,7 @@ fhandler_disk_file::facl (int cmd, int nentries, __aclent32_t *aclbufp)
 	    break;
 	  case GETACL:
 	    if (!aclbufp)
-	      set_errno(EFAULT);
+	      set_errno (EFAULT);
 	    else if (nentries < MIN_ACL_ENTRIES)
 	      set_errno (ENOSPC);
 	    else
diff --git a/winsup/cygwin/sec_helper.cc b/winsup/cygwin/sec_helper.cc
index 002abf48b..8941330aa 100644
--- a/winsup/cygwin/sec_helper.cc
+++ b/winsup/cygwin/sec_helper.cc
@@ -1,6 +1,6 @@
 /* sec_helper.cc: NT security helper functions
 
-   Copyright 2000, 2001, 2002, 2003, 2004 Red Hat, Inc.
+   Copyright 2000, 2001, 2002, 2003, 2004, 2006 Red Hat, Inc.
 
    Written by Corinna Vinschen <corinna@vinschen.de>
 
diff --git a/winsup/cygwin/security.cc b/winsup/cygwin/security.cc
index 856ba42ed..0a4f55761 100644
--- a/winsup/cygwin/security.cc
+++ b/winsup/cygwin/security.cc
@@ -1,6 +1,7 @@
 /* security.cc: NT security functions
 
-   Copyright 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 Red Hat, Inc.
+   Copyright 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
+   2006 Red Hat, Inc.
 
    Originaly written by Gunther Ebert, gunther.ebert@ixos-leipzig.de
    Completely rewritten by Corinna Vinschen <corinna@vinschen.de>
@@ -1973,6 +1974,9 @@ check_registry_access (HANDLE hdl, int flags)
     desired |= KEY_QUERY_VALUE;
   if (!get_nt_object_security (hdl, SE_REGISTRY_KEY, sd))
     ret = check_access (sd, mapping, desired, flags);
+  /* As long as we can't write the registry... */
+  if (flags & W_OK)
+    ret = -1;
   debug_printf ("flags %x, ret %d", flags, ret);
   return ret;
 }
diff --git a/winsup/cygwin/security.h b/winsup/cygwin/security.h
index 2b5b57275..fa5953d89 100644
--- a/winsup/cygwin/security.h
+++ b/winsup/cygwin/security.h
@@ -1,6 +1,6 @@
 /* security.h: security declarations
 
-   Copyright 2000, 2001, 2002, 2003, 2004, 2005 Red Hat, Inc.
+   Copyright 2000, 2001, 2002, 2003, 2004, 2005, 2006 Red Hat, Inc.
 
 This file is part of Cygwin.