External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-24 22:55:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

security: use a single function to set DAC user and group

Browse Source 
Merge the functions 'virSecurityDACSetUser' and
'virSecurityDACSetGroup' into 'virSecurityDACSetUserAndGroup'.

Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
This commit is contained in:
Giuseppe Scrivano 2013-10-18 14:13:19 +02:00 committed by Eric Blake
parent 1bc12e1c46
commit 4387132f31
3 changed files with 21 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/security/security_dac.c
View File

@ -47,22 +47,25 @@ struct _virSecurityDACData {
gid_t *groups; gid_t *groups;
int ngroups; int ngroups;
bool dynamicOwnership; bool dynamicOwnership;
char *baselabel;
}; };
void /* returns -1 on error, 0 on success */
virSecurityDACSetUser(virSecurityManagerPtr mgr, int
uid_t user) virSecurityDACSetUserAndGroup(virSecurityManagerPtr mgr,
uid_t user,
gid_t group)
{ {
virSecurityDACDataPtr priv = virSecurityManagerGetPrivateData(mgr); virSecurityDACDataPtr priv = virSecurityManagerGetPrivateData(mgr);
priv->user = user; priv->user = user;
}
void
virSecurityDACSetGroup(virSecurityManagerPtr mgr,
gid_t group)
{
virSecurityDACDataPtr priv = virSecurityManagerGetPrivateData(mgr);
priv->group = group; priv->group = group;
if (virAsprintf(&priv->baselabel, "%u:%u",
(unsigned int) user,
(unsigned int) group) < 0)
return -1;
return 0;
} }
void void
@ -217,6 +220,7 @@ virSecurityDACClose(virSecurityManagerPtr mgr)
{ {
virSecurityDACDataPtr priv = virSecurityManagerGetPrivateData(mgr); virSecurityDACDataPtr priv = virSecurityManagerGetPrivateData(mgr);
VIR_FREE(priv->groups); VIR_FREE(priv->groups);
VIR_FREE(priv->baselabel);
return 0; return 0;
} }

7
src/security/security_dac.h
View File

@ -25,10 +25,9 @@
extern virSecurityDriver virSecurityDriverDAC; extern virSecurityDriver virSecurityDriverDAC;
void virSecurityDACSetUser(virSecurityManagerPtr mgr, int virSecurityDACSetUserAndGroup(virSecurityManagerPtr mgr,
uid_t user); uid_t user,
void virSecurityDACSetGroup(virSecurityManagerPtr mgr, gid_t group);
gid_t group);
void virSecurityDACSetDynamicOwnership(virSecurityManagerPtr mgr, void virSecurityDACSetDynamicOwnership(virSecurityManagerPtr mgr,
bool dynamic); bool dynamic);

6
src/security/security_manager.c
View File

@ -146,8 +146,10 @@ virSecurityManagerPtr virSecurityManagerNewDAC(const char *virtDriver,
if (!mgr) if (!mgr)
return NULL; return NULL;
virSecurityDACSetUser(mgr, user); if (virSecurityDACSetUserAndGroup(mgr, user, group) < 0) {
virSecurityDACSetGroup(mgr, group); virSecurityManagerDispose(mgr);
return NULL;
}
virSecurityDACSetDynamicOwnership(mgr, dynamicOwnership); virSecurityDACSetDynamicOwnership(mgr, dynamicOwnership);
return mgr; return mgr;