External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-11-09 15:00:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

util: Keep errno set to the root error after when returning from virSetUIDGID

Browse Source
This commit is contained in:
Jiri Denemark 2011-05-22 17:16:44 +03:00
parent ef54d045c3
commit 4dd9c16161
1 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/util/util.c
View File

@ -2889,17 +2889,20 @@ int virGetGroupID(const char *name,
/* Set the real and effective uid and gid to the given values, and call /* Set the real and effective uid and gid to the given values, and call
* initgroups so that the process has all the assumed group membership of * initgroups so that the process has all the assumed group membership of
* that uid. return 0 on success, -1 on failure. * that uid. return 0 on success, -1 on failure (the original system error
* remains in errno).
*/ */
int int
virSetUIDGID(uid_t uid, gid_t gid) virSetUIDGID(uid_t uid, gid_t gid)
{ {
int err;
if (gid > 0) { if (gid > 0) {
if (setregid(gid, gid) < 0) { if (setregid(gid, gid) < 0) {
virReportSystemError(errno, virReportSystemError(err = errno,
_("cannot change to '%d' group"), _("cannot change to '%d' group"),
(unsigned int) gid); (unsigned int) gid);
return -1; goto error;
} }
} }
@ -2916,39 +2919,45 @@ virSetUIDGID(uid_t uid, gid_t gid)
if (VIR_ALLOC_N(buf, bufsize) < 0) { if (VIR_ALLOC_N(buf, bufsize) < 0) {
virReportOOMError(); virReportOOMError();
return -1; err = ENOMEM;
goto error;
} }
while ((rc = getpwuid_r(uid, &pwd, buf, bufsize, while ((rc = getpwuid_r(uid, &pwd, buf, bufsize,
&pwd_result)) == ERANGE) { &pwd_result)) == ERANGE) {
if (VIR_RESIZE_N(buf, bufsize, bufsize, bufsize) < 0) { if (VIR_RESIZE_N(buf, bufsize, bufsize, bufsize) < 0) {
virReportOOMError(); virReportOOMError();
VIR_FREE(buf); VIR_FREE(buf);
return -1; err = ENOMEM;
goto error;
} }
} }
if (rc || !pwd_result) { if (rc || !pwd_result) {
virReportSystemError(rc, _("cannot getpwuid_r(%d)"), virReportSystemError(err = rc, _("cannot getpwuid_r(%d)"),
(unsigned int) uid); (unsigned int) uid);
VIR_FREE(buf); VIR_FREE(buf);
return -1; goto error;
} }
if (initgroups(pwd.pw_name, pwd.pw_gid) < 0) { if (initgroups(pwd.pw_name, pwd.pw_gid) < 0) {
virReportSystemError(errno, virReportSystemError(err = errno,
_("cannot initgroups(\"%s\", %d)"), _("cannot initgroups(\"%s\", %d)"),
pwd.pw_name, (unsigned int) pwd.pw_gid); pwd.pw_name, (unsigned int) pwd.pw_gid);
VIR_FREE(buf); VIR_FREE(buf);
return -1; goto error;
} }
VIR_FREE(buf); VIR_FREE(buf);
# endif # endif
if (setreuid(uid, uid) < 0) { if (setreuid(uid, uid) < 0) {
virReportSystemError(errno, virReportSystemError(err = errno,
_("cannot change to uid to '%d'"), _("cannot change to uid to '%d'"),
(unsigned int) uid); (unsigned int) uid);
return -1; goto error;
} }
} }
return 0; return 0;
error:
errno = err;
return -1;
} }
#else /* HAVE_GETPWUID_R */ #else /* HAVE_GETPWUID_R */