[dpkg] 94/187: s-s-d: On FreeBSD return STATUS_UNKNOWN instead of false in do_procinit()
Reiner Herrmann
reiner at reiner-h.de
Sun Nov 6 12:46:29 UTC 2016
This is an automated email from the git hooks/post-receive script.
deki-guest pushed a commit to branch master
in repository dpkg.
commit 97af191aa67e3b6c03ba7d7fa22a88a0ec6591df
Author: Guillem Jover <guillem at debian.org>
Date: Tue Aug 23 21:41:35 2016 +0200
s-s-d: On FreeBSD return STATUS_UNKNOWN instead of false in do_procinit()
The function returns an enum status_code, not a bool.
---
debian/changelog | 2 ++
utils/start-stop-daemon.c | 8 ++++----
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 477ec51..82eff79 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -38,6 +38,8 @@ dpkg (1.18.11) UNRELEASED; urgency=medium
polluting ones (such as “linux”, “OPENBSD” or “hpux”).
- Handle _POSIX_PRIORITY_SCHEDULING being defined to -1 or 0 in
start-stop-daemon. This affects Mac OS X.
+ - On FreeBSD return STATUS_UNKNOWN instead of false in start-stop-daemon
+ do_procinit().
* Perl modules:
- Obsolete Source-Version substvar in Dpkg::Substvars by emitting errors.
- Rework keyring hooks in Dpkg::Vendor. Deprecate the keyrings hook, and
diff --git a/utils/start-stop-daemon.c b/utils/start-stop-daemon.c
index 4245e45..440d17f 100644
--- a/utils/start-stop-daemon.c
+++ b/utils/start-stop-daemon.c
@@ -1929,16 +1929,16 @@ do_procinit(void)
rc = sysctl(mib, 3, NULL, &len, NULL, 0);
if (rc != 0 && errno != ESRCH)
- return false;
+ return STATUS_UNKNOWN;
if (len == 0)
- return false;
+ return STATUS_UNKNOWN;
kp = xmalloc(len);
rc = sysctl(mib, 3, kp, &len, NULL, 0);
if (rc != 0 && errno != ESRCH)
- return false;
+ return STATUS_UNKNOWN;
if (len == 0)
- return false;
+ return STATUS_UNKNOWN;
nentries = len / sizeof(*kp);
for (i = 0; i < nentries; i++) {
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/reproducible/dpkg.git
More information about the Reproducible-commits
mailing list