Просмотр исходного кода

s-s-d: On FreeBSD return STATUS_UNKNOWN instead of false in do_procinit()

The function returns an enum status_code, not a bool.
Guillem Jover лет назад: 10
Родитель
Сommit
97af191aa6
2 измененных файлов с 6 добавлено и 4 удалено
  1. 2 0
      debian/changelog
  2. 4 4
      utils/start-stop-daemon.c

+ 2 - 0
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

+ 4 - 4
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++) {