7:08 a.m.
Since not only systemd can do this (we'll be doing it as well few
patches later), change 'systemd' to 'caller' and fix LISTEN_FDS to
LISTEN_PID where applicable.
Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com>
---
src/libvirt_private.syms | 1 +
src/locking/lock_daemon.c | 45 +++-------------------------------
src/util/virutil.c | 62 +++++++++++++++++++++++++++++++++++++++++++++++
src/util/virutil.h | 2 ++
4 files changed, 69 insertions(+), 41 deletions(-)
diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
index 08111d4..7516ed3 100644
--- a/src/libvirt_private.syms
+++ b/src/libvirt_private.syms
@@ -2107,6 +2107,7 @@ virGetGroupID;
virGetGroupList;
virGetGroupName;
virGetHostname;
+virGetListenFDs;
virGetSelfLastChanged;
virGetUnprivSGIOSysfsPath;
virGetUserCacheDirectory;
diff --git a/src/locking/lock_daemon.c b/src/locking/lock_daemon.c
index 3379f29..e9219d5 100644
--- a/src/locking/lock_daemon.c
+++ b/src/locking/lock_daemon.c
@@ -600,50 +600,13 @@ static int
virLockDaemonSetupNetworkingSystemD(virNetServerPtr srv)
{
virNetServerServicePtr svc;
- const char *pidstr;
- const char *fdstr;
- unsigned long long procid;
unsigned int nfds;
- VIR_DEBUG("Setting up networking from systemd");
-
- if (!(pidstr = virGetEnvAllowSUID("LISTEN_PID"))) {
- VIR_DEBUG("No LISTEN_FDS from systemd");
- return 0;
- }
-
- if (virStrToLong_ull(pidstr, NULL, 10, &procid) < 0) {
- VIR_DEBUG("Malformed LISTEN_PID from systemd %s", pidstr);
- return 0;
- }
-
- if ((pid_t)procid != getpid()) {
- VIR_DEBUG("LISTEN_PID %s is not for us %llu",
- pidstr, (unsigned long long)getpid());
- return 0;
- }
-
- if (!(fdstr = virGetEnvAllowSUID("LISTEN_FDS"))) {
- VIR_DEBUG("No LISTEN_FDS from systemd");
- return 0;
- }
-
- if (virStrToLong_ui(fdstr, NULL, 10, &nfds) < 0) {
- VIR_DEBUG("Malformed LISTEN_FDS from systemd %s", fdstr);
- return 0;
- }
-
- if (nfds > 1) {
- VIR_DEBUG("Too many (%d) file descriptors from systemd",
- nfds);
- nfds = 1;
- }
-
- unsetenv("LISTEN_PID");
- unsetenv("LISTEN_FDS");
-
- if (nfds == 0)
+ if ((nfds = virGetListenFDs()) == 0)
return 0;
+ if (nfds > 1)
+ VIR_DEBUG("Too many (%d) file descriptors from systemd", nfds);
+ nfds = 1;
/* Systemd passes FDs, starting immediately after stderr,
* so the first FD we'll get is '3'. */
diff --git a/src/util/virutil.c b/src/util/virutil.c
index 50faf2b..1d897d9 100644
--- a/src/util/virutil.c
+++ b/src/util/virutil.c
@@ -2396,3 +2396,65 @@ void virUpdateSelfLastChanged(const char *path)
selfLastChanged = sb.st_ctime;
}
}
+
+/**
+ * virGetListenFDs:
+ *
+ * Parse LISTEN_PID and LISTEN_FDS passed from caller.
+ *
+ * Returns number of passed FDs.
+ */
+unsigned int
+virGetListenFDs(void)
+{
+ const char *pidstr;
+ const char *fdstr;
+ size_t i = 0;
+ unsigned long long procid;
+ unsigned int nfds;
+
+ VIR_DEBUG("Setting up networking from caller");
+
+ if (!(pidstr = virGetEnvAllowSUID("LISTEN_PID"))) {
+ VIR_DEBUG("No LISTEN_PID from caller");
+ return 0;
+ }
+
+ if (virStrToLong_ull(pidstr, NULL, 10, &procid) < 0) {
+ VIR_DEBUG("Malformed LISTEN_PID from caller %s", pidstr);
+ return 0;
+ }
+
+ if ((pid_t)procid != getpid()) {
+ VIR_DEBUG("LISTEN_PID %s is not for us %llu",
+ pidstr, (unsigned long long)getpid());
+ return 0;
+ }
+
+ if (!(fdstr = virGetEnvAllowSUID("LISTEN_FDS"))) {
+ VIR_DEBUG("No LISTEN_FDS from caller");
+ return 0;
+ }
+
+ if (virStrToLong_ui(fdstr, NULL, 10, &nfds) < 0) {
+ VIR_DEBUG("Malformed LISTEN_FDS from caller %s", fdstr);
+ return 0;
+ }
+
+ unsetenv("LISTEN_PID");
+ unsetenv("LISTEN_FDS");
+
+ VIR_DEBUG("Got %u file descriptors", nfds);
+
+ for (i = 0; i < nfds; i++) {
+ int fd = STDERR_FILENO + i + 1;
+
+ VIR_DEBUG("Disabling inheritance of passed FD %d", fd);
+
+ if (virSetInherit(fd, false) < 0) {
+ VIR_WARN("Couldn't disable inheritance of passed FD %d", fd);
+ }
+ }
+
+ return nfds;
+}
diff --git a/src/util/virutil.h b/src/util/virutil.h
index f93ea93..89b7923 100644
--- a/src/util/virutil.h
+++ b/src/util/virutil.h
@@ -232,4 +232,6 @@ typedef enum {
VIR_ENUM_DECL(virTristateBool)
VIR_ENUM_DECL(virTristateSwitch)
+unsigned int virGetListenFDs(void);
+
#endif /* __VIR_UTIL_H__ */
--
2.0.4