chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
38f6aef
)
preserve 'sticky bit' on 'add/change' events
author
Kay Sievers
<kay.sievers@vrfy.org>
Sun, 14 Aug 2011 17:04:16 +0000
(19:04 +0200)
committer
Kay Sievers
<kay.sievers@vrfy.org>
Sun, 14 Aug 2011 17:04:16 +0000
(19:04 +0200)
udev/udev-node.c
patch
|
blob
|
history
diff --git
a/udev/udev-node.c
b/udev/udev-node.c
index 6fbe250b85ff0e836ae30302302d25c267c7471d..71488c93ad00f4ffd7303f583f804c153e568600 100644
(file)
--- a/
udev/udev-node.c
+++ b/
udev/udev-node.c
@@
-52,7
+52,9
@@
int udev_node_mknod(struct udev_device *dev, const char *file, mode_t mode, uid_
if (lstat(file, &stats) == 0) {
if (((stats.st_mode & S_IFMT) == (mode & S_IFMT)) && (stats.st_rdev == devnum)) {
info(udev, "preserve file '%s', because it has correct dev_t\n", file);
if (lstat(file, &stats) == 0) {
if (((stats.st_mode & S_IFMT) == (mode & S_IFMT)) && (stats.st_rdev == devnum)) {
info(udev, "preserve file '%s', because it has correct dev_t\n", file);
- if (stats.st_mode != mode || stats.st_uid != uid || stats.st_gid != gid) {
+ if ((stats.st_mode & 0777) != (mode & 0777) || stats.st_uid != uid || stats.st_gid != gid) {
+ /* preserve 'sticky' bit, if already set */
+ mode |= stats.st_mode & 01000;
info(udev, "set permissions %s, %#o, uid=%u, gid=%u\n", file, mode, uid, gid);
chmod(file, mode);
chown(file, uid, gid);
info(udev, "set permissions %s, %#o, uid=%u, gid=%u\n", file, mode, uid, gid);
chmod(file, mode);
chown(file, uid, gid);