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

libzfs: don't mark prompt+raw as retriable 

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Ahelenia Ziemiańska <nabijaczleweli@nabijaczleweli.xyz>
Closes #11911
Closes #11031
This commit is contained in:
наб 2021-04-16 17:52:47 +02:00 committed by Tony Hutter
parent edf3d7aa43
commit 1d65d1a597
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/libzfs/libzfs_crypto.c
View File

@ -518,7 +518,7 @@ get_key_material(libzfs_handle_t *hdl, boolean_t do_verify, boolean_t newkey,
switch (keyloc) { switch (keyloc) {
case ZFS_KEYLOCATION_PROMPT: case ZFS_KEYLOCATION_PROMPT:
if (isatty(fileno(stdin))) { if (isatty(fileno(stdin))) {
can_retry = B_TRUE; can_retry = keyformat != ZFS_KEYFORMAT_RAW;
ret = get_key_interactive(hdl, fsname, keyformat, ret = get_key_interactive(hdl, fsname, keyformat,
do_verify, newkey, &km, &kmlen); do_verify, newkey, &km, &kmlen);
} else { } else {