External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-03-07 17:28:15 +00:00
Code

src: conditionalize use of S_ISSOCK macro

Browse Source 
The S_ISSOCK macro is not available on Windows platforms.

Reviewed-by: Pavel Hrdina <phrdina@redhat.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
This commit is contained in:
Daniel P. Berrangé 2020-01-17 11:17:49 +00:00
parent cf308f13db
commit 3ec271bada
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/libvirt-domain.c
View File

@ -10584,12 +10584,14 @@ virDomainOpenGraphics(virDomainPtr dom,
goto error; goto error;
} }
#ifndef WIN32
if (!S_ISSOCK(sb.st_mode)) { if (!S_ISSOCK(sb.st_mode)) {
virReportInvalidArg(fd, virReportInvalidArg(fd,
_("fd %d must be a socket"), _("fd %d must be a socket"),
fd); fd);
goto error; goto error;
} }
#endif /* !WIN32 */
virCheckReadOnlyGoto(dom->conn->flags, error); virCheckReadOnlyGoto(dom->conn->flags, error);

2
src/security/security_manager.c
View File

@ -1340,11 +1340,13 @@ virSecurityManagerMetadataLock(virSecurityManagerPtr mgr G_GNUC_UNUSED,
} }
if ((fd = open(p, O_RDWR)) < 0) { if ((fd = open(p, O_RDWR)) < 0) {
#ifndef WIN32
if (S_ISSOCK(sb.st_mode)) { if (S_ISSOCK(sb.st_mode)) {
/* Sockets can be opened only if there exists the /* Sockets can be opened only if there exists the
* other side that listens. */ * other side that listens. */
continue; continue;
} }
#endif /* !WIN32 */
virReportSystemError(errno, virReportSystemError(errno,
_("unable to open %s"), _("unable to open %s"),