diff options
| author | msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2011-09-07 22:31:27 +0000 |
|---|---|---|
| committer | msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2011-09-07 22:31:27 +0000 |
| commit | 85dda01c84763aecc4d31e15246d0ac5986eedae (patch) | |
| tree | 4f8b999e8443b1c8def8c79d70338bd4e0179e29 /cups/file.c | |
| parent | a48458814a4c26a6430b27105c0ab747c907473f (diff) | |
| download | cups-85dda01c84763aecc4d31e15246d0ac5986eedae.tar.gz | |
Merge changes from CUPS 1.6svn-r9968.
git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@3411 a1ca3aef-8c08-0410-bb20-df032aa958be
Diffstat (limited to 'cups/file.c')
| -rw-r--r-- | cups/file.c | 18 |
1 files changed, 3 insertions, 15 deletions
diff --git a/cups/file.c b/cups/file.c index daa09da85..c6c1cfe56 100644 --- a/cups/file.c +++ b/cups/file.c @@ -167,19 +167,13 @@ _cupsFileCheck( * Verify permission of the file itself: * * 1. Must be owned by root - * 2. Must not be writable by group unless group is root/wheel/admin + * 2. Must not be writable by group * 3. Must not be setuid * 4. Must not be writable by others */ if (fileinfo.st_uid || /* 1. Must be owned by root */ -#ifdef __APPLE__ - ((fileinfo.st_mode & S_IWGRP) && fileinfo.st_gid && - fileinfo.st_gid != 80) || /* 2. Must not be writable by group */ -#else - ((fileinfo.st_mode & S_IWGRP) && fileinfo.st_gid) || - /* 2. Must not be writable by group */ -#endif /* __APPLE__ */ + (fileinfo.st_mode & S_IWGRP) || /* 2. Must not be writable by group */ (fileinfo.st_mode & S_ISUID) || /* 3. Must not be setuid */ (fileinfo.st_mode & S_IWOTH)) /* 4. Must not be writable by others */ { @@ -218,13 +212,7 @@ _cupsFileCheck( } if (fileinfo.st_uid || /* 1. Must be owned by root */ -#ifdef __APPLE__ - ((fileinfo.st_mode & S_IWGRP) && fileinfo.st_gid && - fileinfo.st_gid != 80) || /* 2. Must not be writable by group */ -#else - ((fileinfo.st_mode & S_IWGRP) && fileinfo.st_gid) || - /* 2. Must not be writable by group */ -#endif /* __APPLE__ */ + (fileinfo.st_mode & S_IWGRP) || /* 2. Must not be writable by group */ (fileinfo.st_mode & S_ISUID) || /* 3. Must not be setuid */ (fileinfo.st_mode & S_IWOTH)) /* 4. Must not be writable by others */ { |