mirror of the now-defunct rocklinux.org
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

145 lines
5.4 KiB

  1. # --- ROCK-COPYRIGHT-NOTE-BEGIN ---
  2. #
  3. # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
  4. # Please add additional copyright information _after_ the line containing
  5. # the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
  6. # the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
  7. #
  8. # ROCK Linux: rock-src/package/base/linux/linux26/80-ext23-suiddir.patch
  9. # ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf
  10. #
  11. # This patch file is dual-licensed. It is available under the license the
  12. # patched project is licensed under, as long as it is an OpenSource license
  13. # as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
  14. # of the GNU General Public License as published by the Free Software
  15. # Foundation; either version 2 of the License, or (at your option) any later
  16. # version.
  17. #
  18. # --- ROCK-COPYRIGHT-NOTE-END ---
  19. --- ./fs/ext3/ialloc.c.orig 2002-11-27 23:36:00.000000000 +0100
  20. +++ ./fs/ext3/ialloc.c 2003-01-13 09:50:38.000000000 +0100
  21. @@ -520,6 +520,13 @@
  22. mode |= S_ISGID;
  23. } else
  24. inode->i_gid = current->fsgid;
  25. +#ifdef CONFIG_EXT3_FS_SUIDDIR
  26. + if (dir->i_mode & S_ISUID) {
  27. + mode |= (mode & 0700) >> 3;
  28. + if (S_ISDIR(mode))
  29. + mode |= S_ISUID;
  30. + }
  31. +#endif
  32. inode->i_mode = mode;
  33. inode->i_ino = ino;
  34. --- ./fs/ext2/ialloc.c.orig 2002-11-27 23:36:00.000000000 +0100
  35. +++ ./fs/ext2/ialloc.c 2003-01-13 09:50:38.000000000 +0100
  36. @@ -509,6 +509,13 @@
  37. mode |= S_ISGID;
  38. } else
  39. inode->i_gid = current->fsgid;
  40. +#ifdef CONFIG_EXT2_FS_SUIDDIR
  41. + if (dir->i_mode & S_ISUID) {
  42. + mode |= (mode & 0700) >> 3;
  43. + if (S_ISDIR(mode))
  44. + mode |= S_ISUID;
  45. + }
  46. +#endif
  47. inode->i_mode = mode;
  48. inode->i_ino = ino;
  49. --- ./CREDITS.orig 2002-11-27 23:36:15.000000000 +0100
  50. +++ ./CREDITS 2003-01-13 09:50:46.000000000 +0100
  51. @@ -3346,6 +3346,8 @@
  52. E: god@clifford.at
  53. W: http://www.clifford.at/
  54. D: Menuconfig/lxdialog improvement
  55. +D: Initial Wacom Intuos USB Driver
  56. +D: Ext[23]FS and Reiserfs SUID on directories extension
  57. S: Foehrengasse 16
  58. S: A-2333 Leopoldsdorf b. Wien
  59. S: Austria
  60. --- ./fs/Kconfig.old 2004-09-13 10:51:35.040756792 +0200
  61. +++ ./fs/Kconfig 2004-09-13 10:48:00.735336168 +0200
  62. @@ -50,6 +50,35 @@
  63. If you are not using a security module that requires using
  64. extended attributes for file security labels, say N.
  65. +config EXT2_FS_SUIDDIR
  66. + bool "Ext2fs SUID on Directory Extension"
  67. + depends on EXT2_FS
  68. + ---help---
  69. + As you might know, the SGID flag has a special function on
  70. + directories: files within that directories will be owned by
  71. + the same group that also owns the directory - which is useful
  72. + for creating directories which are shared between the members
  73. + of a group.
  74. +
  75. + But that only makes sense if the umask is set to give full
  76. + permissions to the group (e.g. 007 or 002). Noone would do that
  77. + if there is a system-wide 'users' group - so some distributions
  78. + add an extra group for every user which lets the /etc/group
  79. + file grow very fast and makes the admins life harder ...
  80. +
  81. + Activating this feture adds a function to the SUID flag on
  82. + directories, which usually has no function at all:
  83. +
  84. + If the SUID flag is set for a diectory, all new files in that
  85. + directory will get the same rights in the group-field as they
  86. + have in their user-field. So, if one sets both - SUID and SGID
  87. + - on a directory, it will also work with a umask like 022 or
  88. + 077 and there is no more need for an extra group for every user.
  89. +
  90. + Also, the SUID flag will be set to all subdirectories of a
  91. + SUID directory (as it is already now with the SGID flag on
  92. + directories).
  93. +
  94. config EXT3_FS
  95. tristate "Ext3 journalling file system support"
  96. help
  97. @@ -118,6 +147,35 @@
  98. If you are not using a security module that requires using
  99. extended attributes for file security labels, say N.
  100. +config EXT3_FS_SUIDDIR
  101. + bool "Ext3fs SUID on Directory Extension"
  102. + depends on EXT3_FS
  103. + help
  104. + As you might know, the SGID flag has a special function on
  105. + directories: files within that directories will be owned by
  106. + the same group that also owns the directory - which is useful
  107. + for creating directories which are shared between the members
  108. + of a group.
  109. +
  110. + But that only makes sense if the umask is set to give full
  111. + permissions to the group (e.g. 007 or 002). Noone would do that
  112. + if there is a system-wide 'users' group - so some distributions
  113. + add an extra group for every user which lets the /etc/group
  114. + file grow very fast and makes the admins life harder ...
  115. +
  116. + Activating this feture adds a function to the SUID flag on
  117. + directories, which usually has no function at all:
  118. +
  119. + If the SUID flag is set for a diectory, all new files in that
  120. + directory will get the same rights in the group-field as they
  121. + have in their user-field. So, if one sets both - SUID and SGID
  122. + - on a directory, it will also work with a umask like 022 or
  123. + 077 and there is no more need for an extra group for every user.
  124. +
  125. + Also, the SUID flag will be set to all subdirectories of a
  126. + SUID directory (as it is already now with the SGID flag on
  127. + directories).
  128. +
  129. config JBD
  130. # CONFIG_JBD could be its own option (even modular), but until there are
  131. # other users than ext3, we will simply make it be the same as CONFIG_EXT3_FS
  132. @@ -1289,8 +1347,6 @@
  133. It's currently broken, so for now:
  134. answer N.
  135. -
  136. -
  137. config SYSV_FS
  138. tristate "System V/Xenix/V7/Coherent file system support"
  139. help