diff options
| author | Adam D. Moss <[email protected]> | 2020-04-29 17:33:33 -0700 |
|---|---|---|
| committer | GitHub <[email protected]> | 2020-04-29 17:33:33 -0700 |
| commit | d7d4678fe65689af7f6335c7f84a190139bcbcdf (patch) | |
| tree | a793b5479c832d4fb3c703d6e4c02f11bb19bb26 /lib/libzfs/libzfs_crypto.c | |
| parent | ab16c87e5560b5d8554386cfaded72e7f61465b8 (diff) | |
Fix regression caused by c14ca14
The 'zfs load-key' command was broken for 'keyformat=passphrase'.
Use the correct output vars when stdin is an interactive terminal.
Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: adam moss <[email protected]>
Closes #10264
Closes #10265
Diffstat (limited to 'lib/libzfs/libzfs_crypto.c')
| -rw-r--r-- | lib/libzfs/libzfs_crypto.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/libzfs/libzfs_crypto.c b/lib/libzfs/libzfs_crypto.c index 8e7005f5a..c83c213e3 100644 --- a/lib/libzfs/libzfs_crypto.c +++ b/lib/libzfs/libzfs_crypto.c @@ -520,7 +520,7 @@ get_key_material(libzfs_handle_t *hdl, boolean_t do_verify, boolean_t newkey, if (isatty(fileno(stdin))) { can_retry = B_TRUE; ret = get_key_interactive(hdl, fsname, keyformat, - do_verify, newkey, km_out, kmlen_out); + do_verify, newkey, &km, &kmlen); } else { /* fetch the key material into the buffer */ ret = get_key_material_raw(stdin, keyformat, &km, |