2002-01-03 Roland McGrath <roland@frob.com>

	* file-chmod.c (diskfs_S_file_chmod): Preserve S_ITRANS bits in change.

1 files changed, 30 insertions, 29 deletions

diff --git a/libdiskfs/file-chmod.c b/libdiskfs/file-chmod.c
index 09bbe0ea..5dad2c78 100644
--- a/libdiskfs/file-chmod.c
+++ b/libdiskfs/file-chmod.c
@@ -1,5 +1,5 @@
 /* libdiskfs implementation of fs.defs: file_chmod
-   Copyright (C) 1992, 1993, 1994, 1996, 1997 Free Software Foundation
+   Copyright (C) 1992,93,94,96,97,2002 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
@@ -23,33 +23,34 @@ diskfs_S_file_chmod (struct protid *cred,
 	      mode_t mode)
 {
   mode &= ~(S_IFMT | S_ISPARE | S_ITRANS);
-  
+
   CHANGE_NODE_FIELD (cred,
-		   ({
-		     if (!(err = fshelp_isowner (&np->dn_stat, cred->user)))
-		       {
-			 if (!idvec_contains (cred->user->uids, 0))
-			   {
-			     if (!S_ISDIR (np->dn_stat.st_mode))
-			       mode &= ~S_ISVTX;
-			     if (!idvec_contains (cred->user->gids,
-						  np->dn_stat.st_gid))
-			       mode &= ~S_ISGID;
-			     if (!idvec_contains (cred->user->uids, 
-						  np->dn_stat.st_uid))
-			       mode &= ~S_ISUID;
-			   }
-			 mode |= (np->dn_stat.st_mode & (S_IFMT | S_ISPARE));
-			 err = diskfs_validate_mode_change (np, mode);
-			 if (!err)
-			   {
-			     np->dn_stat.st_mode = mode;
-			     np->dn_set_ctime = 1;
-			     if (np->filemod_reqs)
-			       diskfs_notice_filechange(np, 
-							FILE_CHANGED_META, 
-							0, 0);
-			   }
-		       }
-		   }));
+		     ({
+		       if (!(err = fshelp_isowner (&np->dn_stat, cred->user)))
+			 {
+			   if (!idvec_contains (cred->user->uids, 0))
+			     {
+			       if (!S_ISDIR (np->dn_stat.st_mode))
+				 mode &= ~S_ISVTX;
+			       if (!idvec_contains (cred->user->gids,
+						    np->dn_stat.st_gid))
+				 mode &= ~S_ISGID;
+			       if (!idvec_contains (cred->user->uids,
+						    np->dn_stat.st_uid))
+				 mode &= ~S_ISUID;
+			     }
+			   mode |= (np->dn_stat.st_mode
+				    & (S_IFMT | S_ISPARE | S_ITRANS));
+			   err = diskfs_validate_mode_change (np, mode);
+			   if (!err)
+			     {
+			       np->dn_stat.st_mode = mode;
+			       np->dn_set_ctime = 1;
+			       if (np->filemod_reqs)
+				 diskfs_notice_filechange (np,
+							   FILE_CHANGED_META,
+							   0, 0);
+			     }
+			 }
+		     }));
 }