* modechange.c (mode_compile): Numeric modes now affect setuid and

setgid on directories only if they set these bits.
* modechange.h: Remove obsolete comment about masks.

diff --git a/lib/ChangeLog b/lib/ChangeLog
index 5f475c5..fbca6af 100644 (file)
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,3 +1,9 @@
+2006-07-28  Paul Eggert  <eggert@cs.ucla.edu>
+
+       * modechange.c (mode_compile): Numeric modes now affect setuid and
+       setgid on directories only if they set these bits.
+       * modechange.h: Remove obsolete comment about masks.
+
 2006-07-27  Bruno Haible  <bruno@clisp.org>
 
        * stdint_.h (INT*_C, UINT*_C) [C++]: Define these if

diff --git a/lib/modechange.c b/lib/modechange.c
index 51684a4..80e0671 100644 (file)
--- a/lib/modechange.c
+++ b/lib/modechange.c
@@ -143,12 +143,12 @@ mode_compile (char const *mode_string)
   if ('0' <= *mode_string && *mode_string < '8')
     {
       unsigned int octal_mode = 0;
-      unsigned int octal_mentioned = 0;
+      mode_t mode;
+      mode_t mentioned;
 
       do
        {
          octal_mode = 8 * octal_mode + *mode_string++ - '0';
-         octal_mentioned = 8 * octal_mentioned + 7;
          if (ALLM < octal_mode)
            return NULL;
        }
@@ -157,8 +157,9 @@ mode_compile (char const *mode_string)
       if (*mode_string)
        return NULL;
 
-      return make_node_op_equals (octal_to_mode (octal_mode),
-                                 octal_to_mode (octal_mentioned & ALLM));
+      mode = octal_to_mode (octal_mode);
+      mentioned = (mode & (S_ISUID | S_ISGID)) | S_ISVTX | S_IRWXUGO;
+      return make_node_op_equals (mode, mentioned);
     }
 
   /* Allocate enough space to hold the result.  */
@@ -299,7 +300,8 @@ mode_create_from_ref (const char *ref_file)
    directory if DIR), assuming the umask is UMASK_VALUE, adjusted as
    indicated by the list of change operations CHANGES.  If DIR, the
    type 'X' change affects the returned value even if no execute bits
-   were set in OLDMODE.  If PMODE_BITS is not null, store into
+   were set in OLDMODE, and set user and group ID bits are preserved
+   unless CHANGES mentioned them.  If PMODE_BITS is not null, store into
    *PMODE_BITS a mask denoting file mode bits that are affected by
    CHANGES.
 

diff --git a/lib/modechange.h b/lib/modechange.h
index 30a4594..76e0178 100644 (file)
--- a/lib/modechange.h
+++ b/lib/modechange.h
@@ -17,8 +17,6 @@
    along with this program; if not, write to the Free Software Foundation,
    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
-/* Masks for the `flags' field in a `struct mode_change'. */
-
 #if ! defined MODECHANGE_H_
 # define MODECHANGE_H_