External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-08-28 03:21:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

storage: cast -1 for uid_t|gid_t

Browse Source 
uid_t and gid_t are opaque types, ranging from s32 to u32 to u64.

Explicitly cast the magic -1 to the appropriate type.

Signed-off-by: Philipp Hahn <hahn@univention.de>
This commit is contained in:
Philipp Hahn 2013-02-22 17:41:32 +01:00 committed by Michal Privoznik
parent 81af880a6f
commit 5474870cda
3 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/conf/storage_conf.c
View File

@ -674,8 +674,8 @@ virStorageDefParsePerms(xmlXPathContextPtr ctxt,
if (node == NULL) { if (node == NULL) {
/* Set default values if there is not <permissions> element */ /* Set default values if there is not <permissions> element */
perms->mode = defaultmode; perms->mode = defaultmode;
perms->uid = -1; perms->uid = (uid_t) -1;
perms->gid = -1; perms->gid = (gid_t) -1;
perms->label = NULL; perms->label = NULL;
return 0; return 0;
} }
@ -700,7 +700,7 @@ virStorageDefParsePerms(xmlXPathContextPtr ctxt,
} }
if (virXPathNode("./owner", ctxt) == NULL) { if (virXPathNode("./owner", ctxt) == NULL) {
perms->uid = -1; perms->uid = (uid_t) -1;
} else { } else {
if (virXPathLong("number(./owner)", ctxt, &v) < 0) { if (virXPathLong("number(./owner)", ctxt, &v) < 0) {
virReportError(VIR_ERR_XML_ERROR, virReportError(VIR_ERR_XML_ERROR,
@ -711,7 +711,7 @@ virStorageDefParsePerms(xmlXPathContextPtr ctxt,
} }
if (virXPathNode("./group", ctxt) == NULL) { if (virXPathNode("./group", ctxt) == NULL) {
perms->gid = -1; perms->gid = (gid_t) -1;
} else { } else {
if (virXPathLong("number(./group)", ctxt, &v) < 0) { if (virXPathLong("number(./group)", ctxt, &v) < 0) {
virReportError(VIR_ERR_XML_ERROR, virReportError(VIR_ERR_XML_ERROR,

16
src/storage/storage_backend.c
View File

@ -277,9 +277,9 @@ virStorageBackendCreateBlockFrom(virConnectPtr conn ATTRIBUTE_UNUSED,
vol->target.path); vol->target.path);
goto cleanup; goto cleanup;
} }
uid = (vol->target.perms.uid != st.st_uid) ? vol->target.perms.uid : -1; uid = (vol->target.perms.uid != st.st_uid) ? vol->target.perms.uid : (uid_t) -1;
gid = (vol->target.perms.gid != st.st_gid) ? vol->target.perms.gid : -1; gid = (vol->target.perms.gid != st.st_gid) ? vol->target.perms.gid : (gid_t) -1;
if (((uid != -1) || (gid != -1)) if (((uid != (uid_t) -1) || (gid != (gid_t) -1))
&& (fchown(fd, uid, gid) < 0)) { && (fchown(fd, uid, gid) < 0)) {
virReportSystemError(errno, virReportSystemError(errno,
_("cannot chown '%s' to (%u, %u)"), _("cannot chown '%s' to (%u, %u)"),
@ -542,9 +542,9 @@ static int virStorageBackendCreateExecCommand(virStoragePoolObjPtr pool,
if ((pool->def->type == VIR_STORAGE_POOL_NETFS) if ((pool->def->type == VIR_STORAGE_POOL_NETFS)
&& (((getuid() == 0) && (((getuid() == 0)
&& (vol->target.perms.uid != -1) && (vol->target.perms.uid != (uid_t) -1)
&& (vol->target.perms.uid != 0)) && (vol->target.perms.uid != 0))
|| ((vol->target.perms.gid != -1) || ((vol->target.perms.gid != (gid_t) -1)
&& (vol->target.perms.gid != getgid())))) { && (vol->target.perms.gid != getgid())))) {
virCommandSetUID(cmd, vol->target.perms.uid); virCommandSetUID(cmd, vol->target.perms.uid);
@ -572,9 +572,9 @@ static int virStorageBackendCreateExecCommand(virStoragePoolObjPtr pool,
} }
} }
uid = (vol->target.perms.uid != st.st_uid) ? vol->target.perms.uid : -1; uid = (vol->target.perms.uid != st.st_uid) ? vol->target.perms.uid : (uid_t) -1;
gid = (vol->target.perms.gid != st.st_gid) ? vol->target.perms.gid : -1; gid = (vol->target.perms.gid != st.st_gid) ? vol->target.perms.gid : (gid_t) -1;
if (((uid != -1) || (gid != -1)) if (((uid != (uid_t) -1) || (gid != (gid_t) -1))
&& (chown(vol->target.path, uid, gid) < 0)) { && (chown(vol->target.path, uid, gid) < 0)) {
virReportSystemError(errno, virReportSystemError(errno,
_("cannot chown %s to (%u, %u)"), _("cannot chown %s to (%u, %u)"),

2
src/util/virutil.c
View File

@ -1206,7 +1206,7 @@ parenterror:
_("stat of '%s' failed"), path); _("stat of '%s' failed"), path);
goto childerror; goto childerror;
} }
if ((st.st_gid != gid) && (chown(path, -1, gid) < 0)) { if ((st.st_gid != gid) && (chown(path, (uid_t) -1, gid) < 0)) {
ret = -errno; ret = -errno;
virReportSystemError(errno, virReportSystemError(errno,
_("cannot chown '%s' to group %u"), _("cannot chown '%s' to group %u"),