Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

Correct swapped keylocation error messages 

This patch corrects a small issue where two error messages
in the code that checks for invalid keylocations were
swapped.

Reviewed by: Matt Ahrens <mahrens@delphix.com>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Reviewed-by: Giuseppe Di Natale <dinatale2@llnl.gov>
Signed-off-by: Tom Caputi <tcaputi@datto.com>
Closes #7418
This commit is contained in:
Tom Caputi 2018-04-10 00:11:17 -04:00 committed by Brian Behlendorf
parent 4f301661df
commit 74df0c5e25
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/libzfs/libzfs_dataset.c
View File

@ -1418,16 +1418,16 @@ badlabel:
if (crypt == ZIO_CRYPT_OFF && if (crypt == ZIO_CRYPT_OFF &&
strcmp(strval, "none") != 0) { strcmp(strval, "none") != 0) {
zfs_error_aux(hdl, dgettext(TEXT_DOMAIN, zfs_error_aux(hdl, dgettext(TEXT_DOMAIN,
"keylocation must not be 'none' " "keylocation must be 'none' "
"for encrypted datasets")); "for unencrypted datasets"));
(void) zfs_error(hdl, EZFS_BADPROP, (void) zfs_error(hdl, EZFS_BADPROP,
errbuf); errbuf);
goto error; goto error;
} else if (crypt != ZIO_CRYPT_OFF && } else if (crypt != ZIO_CRYPT_OFF &&
strcmp(strval, "none") == 0) { strcmp(strval, "none") == 0) {
zfs_error_aux(hdl, dgettext(TEXT_DOMAIN, zfs_error_aux(hdl, dgettext(TEXT_DOMAIN,
"keylocation must be 'none' " "keylocation must not be 'none' "
"for unencrypted datasets")); "for encrypted datasets"));
(void) zfs_error(hdl, EZFS_BADPROP, (void) zfs_error(hdl, EZFS_BADPROP,
errbuf); errbuf);
goto error; goto error;