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

PAM: Mount if key is already available 

If, for some reason, the key is already loaded for an unmounted dataset,
proceed with mounting the filesystem instead of failing.

Signed-off-by: Chris Lindee <chris.lindee+github@gmail.com>
This commit is contained in:
Chris Lindee 2022-01-29 18:49:43 -06:00
parent ce51ecb312
commit df5be2c1b7
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/pam_zfs_key/pam_zfs_key.c
View File

@ -389,7 +389,7 @@ decrypt_mount(pam_handle_t *pamh, const char *ds_name,
int ret = lzc_load_key(ds_name, B_FALSE, (uint8_t *)key->value, int ret = lzc_load_key(ds_name, B_FALSE, (uint8_t *)key->value,
WRAPPING_KEY_LEN); WRAPPING_KEY_LEN);
pw_free(key); pw_free(key);
if (ret) { if (ret && ret != EEXIST) {
pam_syslog(pamh, LOG_ERR, "load_key failed: %d", ret); pam_syslog(pamh, LOG_ERR, "load_key failed: %d", ret);
zfs_close(ds); zfs_close(ds);
return (-1); return (-1);