Skip to content

Commit 5feea20

Browse files
nabijaczleweliRyan Moeller
authored andcommitted
libzfs: don't mark prompt+raw as retriable
Reviewed-by: Brian Behlendorf <[email protected]> Signed-off-by: Ahelenia Ziemiańska <[email protected]> Closes openzfs#11911 Closes openzfs#11031
1 parent 3553110 commit 5feea20

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

lib/libzfs/libzfs_crypto.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -512,7 +512,7 @@ get_key_material(libzfs_handle_t *hdl, boolean_t do_verify, boolean_t newkey,
512512
switch (keyloc) {
513513
case ZFS_KEYLOCATION_PROMPT:
514514
if (isatty(fileno(stdin))) {
515-
can_retry = B_TRUE;
515+
can_retry = keyformat != ZFS_KEYFORMAT_RAW;
516516
ret = get_key_interactive(hdl, fsname, keyformat,
517517
do_verify, newkey, &km, &kmlen);
518518
} else {

0 commit comments

Comments
 (0)