emo/openrc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

checkpath: change the owner/group only when requested to do so

Browse Source 
Fix checkpath so that it only changes the owner/group if -o is on the
command line.

Reported-by: <flameeyes@gentoo.org>
X-Gentoo-Bug: 437560
X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=437560
This commit is contained in:
William Hubbs
2012-10-09 16:44:01 -05:00
parent da842085ce
commit 6f345abe91
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/rc/checkpath.c
View File

@@ -60,7 +60,8 @@ extern const char *applet;
* See systemd's src/label.c:label_mkdir * See systemd's src/label.c:label_mkdir
*/ */
static int static int
do_check(char *path, uid_t uid, gid_t gid, mode_t mode, inode_t type, bool trunc) do_check(char *path, uid_t uid, gid_t gid, mode_t mode, inode_t type,
bool trunc, bool chowner)
{ {
struct stat st; struct stat st;
int fd, flags; int fd, flags;
@@ -139,7 +140,7 @@ do_check(char *path, uid_t uid, gid_t gid, mode_t mode, inode_t type, bool trunc
} }
} }
if (st.st_uid != uid || st.st_gid != gid) { if (chowner && (st.st_uid != uid || st.st_gid != gid)) {
if (st.st_dev || st.st_ino) if (st.st_dev || st.st_ino)
einfo("%s: correcting owner", path); einfo("%s: correcting owner", path);
if (chown(path, uid, gid)) { if (chown(path, uid, gid)) {
@@ -223,6 +224,7 @@ checkpath(int argc, char **argv)
inode_t type = inode_unknown; inode_t type = inode_unknown;
int retval = EXIT_SUCCESS; int retval = EXIT_SUCCESS;
bool trunc = 0; bool trunc = 0;
bool chowner = 0;
while ((opt = getopt_long(argc, argv, getoptstring, while ((opt = getopt_long(argc, argv, getoptstring,
longopts, (int *) 0)) != -1) longopts, (int *) 0)) != -1)
@@ -247,6 +249,7 @@ checkpath(int argc, char **argv)
applet, optarg); applet, optarg);
break; break;
case 'o': case 'o':
chowner = 1;
if (parse_owner(&pw, &gr, optarg) != 0) if (parse_owner(&pw, &gr, optarg) != 0)
eerrorx("%s: owner `%s' not found", eerrorx("%s: owner `%s' not found",
applet, optarg); applet, optarg);
@@ -272,7 +275,7 @@ checkpath(int argc, char **argv)
gid = gr->gr_gid; gid = gr->gr_gid;
while (optind < argc) { while (optind < argc) {
if (do_check(argv[optind], uid, gid, mode, type, trunc)) if (do_check(argv[optind], uid, gid, mode, type, trunc, chowner))
retval = EXIT_FAILURE; retval = EXIT_FAILURE;
optind++; optind++;
} }