man/systemd-measure.xml

@@ -346,6 +346,7 @@ $ ukify build \
      <programlisting># systemd-cryptenroll --tpm2-device=auto \
      --tpm2-public-key=tpm2-pcr-public-key.pem \
      --tpm2-signature=tpm2-pcr-signature.json \
+     --tpm2-pcrs="" \
      /dev/sda5</programlisting>
 
      <para>And then unlock the device with the signature:</para>

src/home/homectl.c

@@ -3887,7 +3887,7 @@ static int parse_argv(int argc, char *argv[]) {
                         break;
 
                 case ARG_SETENV: {
-                        _cleanup_strv_free_ char **l = NULL;
+                        _cleanup_free_ char **l = NULL;
                         _cleanup_(sd_json_variant_unrefp) sd_json_variant *ne = NULL;
                         sd_json_variant *e;
 

src/nss-systemd/nss-systemd.c

@@ -726,7 +726,7 @@ enum nss_status _nss_systemd_getgrent_r(
                 int *errnop) {
 
         _cleanup_(group_record_unrefp) GroupRecord *gr = NULL;
-        _cleanup_strv_free_ char **members = NULL;
+        _cleanup_free_ char **members = NULL;
         int r;
 
         PROTECT_ERRNO;

src/shared/ask-password-api.c

@@ -1133,8 +1133,6 @@ static int ask_password_credential(const AskPasswordRequest *req, AskPasswordFla
         r = read_credential(req->credential, (void**) &buffer, &size);
         if (IN_SET(r, -ENXIO, -ENOENT)) /* No credentials passed or this credential not defined? */
                 return -ENOKEY;
-        if (r < 0)
-                return r;
 
         l = strv_parse_nulstr(buffer, size);
         if (!l)

src/shared/reread-partition-table.c

@@ -257,7 +257,7 @@ static int reread_partition_table_full(sd_device *dev, int fd, RereadPartitionTa
         if (FLAGS_SET(flags, REREADPT_BSD_LOCK)) {
                 lock_fd = fd_reopen(fd, O_RDONLY|O_CLOEXEC|O_NOCTTY);
                 if (lock_fd < 0)
-                        return log_device_debug_errno(dev, lock_fd, "Failed top open lock fd for block device '%s': %m", p);
+                        return log_device_debug_errno(dev, r, "Failed top open lock fd for block device '%s': %m", p);
 
                 if (flock(lock_fd, LOCK_EX|LOCK_NB) < 0)
                         return log_device_debug_errno(dev, errno, "Failed to take BSD lock on block device '%s': %m", p);

test/units/TEST-87-AUX-UTILS-VM.bootctl.sh

@@ -346,8 +346,7 @@ EOF
     bootctl remove
 }
 
-# Order this first, as other test cases mess with the ESP and might break 'bootctl status' output
-testcase_00_secureboot() {
+testcase_secureboot() {
     if [ ! -d /sys/firmware/efi ]; then
         echo "Not booted with EFI, skipping secureboot tests."
         return 0