From 458610429f077db352768ca6106a1ffad9c7673d Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Fri, 18 Dec 2020 12:59:29 +0900 Subject: [PATCH] tree-wide: fix typo --- man/systemd-cryptenroll.xml | 2 +- src/cryptenroll/cryptenroll-wipe.c | 2 +- src/cryptenroll/cryptenroll.c | 4 ++-- src/cryptsetup/cryptsetup-fido2.c | 2 +- src/cryptsetup/cryptsetup.c | 2 +- src/shared/firewall-util-nft.c | 11 +++++++---- src/test/test-mountpoint-util.c | 6 +++--- src/udev/dmi_memory_id/dmi_memory_id.c | 4 ++-- 8 files changed, 18 insertions(+), 15 deletions(-) diff --git a/man/systemd-cryptenroll.xml b/man/systemd-cryptenroll.xml index 17a546b256..93acdd02a5 100644 --- a/man/systemd-cryptenroll.xml +++ b/man/systemd-cryptenroll.xml @@ -246,7 +246,7 @@ systemd-cryptenroll /dev/sda1 --wipe-slot=tpm2 --tpm2-device=auto - The above command will enroll the TPM2 chip, and then wipe all previously crated TPM2 + The above command will enroll the TPM2 chip, and then wipe all previously created TPM2 enrollments on the LUKS2 volume, leaving only the newly created one. Combining wiping and enrollment may also be used to replace enrollments of different types, for example for changing from a PKCS#11 enrollment to a FIDO2 one: diff --git a/src/cryptenroll/cryptenroll-wipe.c b/src/cryptenroll/cryptenroll-wipe.c index 3c4a4e6acb..2f0f68fe86 100644 --- a/src/cryptenroll/cryptenroll-wipe.c +++ b/src/cryptenroll/cryptenroll-wipe.c @@ -258,7 +258,7 @@ static int find_slot_tokens(struct crypt_device *cd, Set *wipe_slots, Set *keep_ return log_oom(); } - /* And of course, als remember the tokens to remove. */ + /* And of course, also remember the tokens to remove. */ if (shall_wipe) if (set_put(wipe_tokens, INT_TO_PTR(token)) < 0) return log_oom(); diff --git a/src/cryptenroll/cryptenroll.c b/src/cryptenroll/cryptenroll.c index fb41bbe4aa..b28dbcd665 100644 --- a/src/cryptenroll/cryptenroll.c +++ b/src/cryptenroll/cryptenroll.c @@ -90,7 +90,7 @@ static int help(void) { " --tpm2-device=PATH\n" " Enroll a TPM2 device\n" " --tpm2-pcrs=PCR1,PCR2,PCR3,…\n" - " Specifiy TPM2 PCRs to seal against\n" + " Specify TPM2 PCRs to seal against\n" " --wipe-slot=SLOT1,SLOT2,…\n" " Wipe specified slots\n" "\nSee the %s for details.\n" @@ -390,7 +390,7 @@ static int prepare_luks( password, strlen(password)); if (r < 0) - return log_error_errno(r, "Password from environent variable $PASSWORD did not work."); + return log_error_errno(r, "Password from environment variable $PASSWORD did not work."); } else { AskPasswordFlags ask_password_flags = ASK_PASSWORD_PUSH_CACHE|ASK_PASSWORD_ACCEPT_CACHED; _cleanup_free_ char *question = NULL, *disk_path = NULL; diff --git a/src/cryptsetup/cryptsetup-fido2.c b/src/cryptsetup/cryptsetup-fido2.c index 5edda0cf9d..cc18f83658 100644 --- a/src/cryptsetup/cryptsetup-fido2.c +++ b/src/cryptsetup/cryptsetup-fido2.c @@ -90,7 +90,7 @@ int acquire_fido2_key( r = ask_password_auto("Please enter security token PIN:", "drive-harddisk", NULL, "fido2-pin", until, flags, &pins); if (r < 0) - return log_error_errno(r, "Failed to ask for user pasword: %m"); + return log_error_errno(r, "Failed to ask for user password: %m"); flags &= ~ASK_PASSWORD_ACCEPT_CACHED; } diff --git a/src/cryptsetup/cryptsetup.c b/src/cryptsetup/cryptsetup.c index 538cda9c86..7b21a7457a 100644 --- a/src/cryptsetup/cryptsetup.c +++ b/src/cryptsetup/cryptsetup.c @@ -1035,7 +1035,7 @@ static int attach_luks_or_plain_or_bitlk_by_tpm2( &keyslot, &token); if (r == -ENXIO) { - /* No futher TPM2 tokens found in the LUKS2 header.*/ + /* No further TPM2 tokens found in the LUKS2 header.*/ if (found_some) return log_debug_errno(SYNTHETIC_ERRNO(EAGAIN), "No TPM2 metadata matching the current system state found in LUKS2 header, falling back to traditional unlocking."); diff --git a/src/shared/firewall-util-nft.c b/src/shared/firewall-util-nft.c index 69bc233164..d48811a58a 100644 --- a/src/shared/firewall-util-nft.c +++ b/src/shared/firewall-util-nft.c @@ -314,12 +314,13 @@ static int nfnl_add_expr_masq(sd_netlink_message *m) { return sd_netlink_message_close_container(m); /* NFTA_LIST_ELEM */ } -/* -t nat -A POSTROUTING -p protocol -s source/pflen -o out_interface -d destionation/pflen -j MASQUERADE */ static int sd_nfnl_message_new_masq_rule(sd_netlink *nfnl, sd_netlink_message **ret, int family, const char *chain) { _cleanup_(sd_netlink_message_unrefp) sd_netlink_message *m = NULL; int r; + /* -t nat -A POSTROUTING -p protocol -s source/pflen -o out_interface -d destination/pflen -j MASQUERADE */ + r = sd_nfnl_nft_message_new_rule(nfnl, &m, family, NFT_SYSTEMD_TABLE_NAME, chain); if (r < 0) return r; @@ -351,7 +352,6 @@ static int sd_nfnl_message_new_masq_rule(sd_netlink *nfnl, sd_netlink_message ** return 0; } -/* -t nat -A PREROUTING -p protocol --dport local_port -i in_interface -s source/pflen -d destionation/pflen -j DNAT --to-destination remote_addr:remote_port */ static int sd_nfnl_message_new_dnat_rule_pre(sd_netlink *nfnl, sd_netlink_message **ret, int family, const char *chain) { _cleanup_(sd_netlink_message_unrefp) sd_netlink_message *m = NULL; @@ -359,6 +359,9 @@ static int sd_nfnl_message_new_dnat_rule_pre(sd_netlink *nfnl, sd_netlink_messag uint32_t local = RTN_LOCAL; int r; + /* -t nat -A PREROUTING -p protocol --dport local_port -i in_interface -s source/pflen + * -d destination/pflen -j DNAT --to-destination remote_addr:remote_port */ + r = sd_nfnl_nft_message_new_rule(nfnl, &m, family, NFT_SYSTEMD_TABLE_NAME, chain); if (r < 0) return r; @@ -471,7 +474,7 @@ static int sd_nfnl_message_new_dnat_rule_out(sd_netlink *nfnl, sd_netlink_messag return r; /* 4th statement: dnat connection to address/port retrieved by the - * preceeding expression. */ + * preceding expression. */ proto_reg = NFT_REG32_02; r = nfnl_add_expr_dnat(m, family, NFT_REG32_01, proto_reg); if (r < 0) @@ -788,7 +791,7 @@ static int nft_message_add_setelem_iprange(sd_netlink_message *m, * In the nftables case, everything gets removed. The next add operation * will yield -ENOENT. * - * If we see -ENOENT on add, replay the inital table setup. + * If we see -ENOENT on add, replay the initial table setup. * If that works, re-do the add operation. * * Note that this doesn't protect against external sabotage such as a diff --git a/src/test/test-mountpoint-util.c b/src/test/test-mountpoint-util.c index 47fde5cb2c..125e5ac9fa 100644 --- a/src/test/test-mountpoint-util.c +++ b/src/test/test-mountpoint-util.c @@ -280,9 +280,9 @@ static void test_fd_is_mount_point(void) { assert_se(fd_is_mount_point(fd, "proc", 0) > 0); assert_se(fd_is_mount_point(fd, "proc/", 0) > 0); - /* /root's entire raison d'etre is to be on the root file system (i.e. not in /home/ which might be - * split off), so that the user can always log in, so it cannot be a mount point unless the system is - * borked. Let's allow for it to be missing though. */ + /* /root's entire reason for being is to be on the root file system (i.e. not in /home/ which + * might be split off), so that the user can always log in, so it cannot be a mount point unless + * the system is borked. Let's allow for it to be missing though. */ assert_se(IN_SET(fd_is_mount_point(fd, "root", 0), -ENOENT, 0)); assert_se(IN_SET(fd_is_mount_point(fd, "root/", 0), -ENOENT, 0)); } diff --git a/src/udev/dmi_memory_id/dmi_memory_id.c b/src/udev/dmi_memory_id/dmi_memory_id.c index dfb243483c..5529daa602 100644 --- a/src/udev/dmi_memory_id/dmi_memory_id.c +++ b/src/udev/dmi_memory_id/dmi_memory_id.c @@ -572,7 +572,7 @@ static int dmi_table(int64_t base, uint32_t len, uint16_t num, const char *devme /* * When reading from sysfs or from a dump file, the file may be - * shorter than announced. For SMBIOS v3 this is expcted, as we + * shorter than announced. For SMBIOS v3 this is expected, as we * only know the maximum table size, not the actual table size. * For older implementations (and for SMBIOS v3 too), this * would be the result of the kernel truncating the table on @@ -599,7 +599,7 @@ static int smbios3_decode(const uint8_t *buf, const char *devmem, bool no_file_o buf[0x06], 0x18U); if (!verify_checksum(buf, buf[0x06])) - return log_error_errno(SYNTHETIC_ERRNO(EINVAL), "Faied to verify checksum."); + return log_error_errno(SYNTHETIC_ERRNO(EINVAL), "Failed to verify checksum."); offset = QWORD(buf + 0x10); if (!no_file_offset && (offset >> 32) != 0 && sizeof(int64_t) < 8)