usr/src/common/zfs/zcrypt_common.c ---------------------------------- mcp-10 - A few lines about "inherit", "on", and "off" would help. usr/src/lib/libcryptoutil/common/keyfile.c ---------------------------------------- mcp-11 line 46 Change comment to say function returns errno. mcp-12 lines 90-93 Why can''t you goto error? usr/src/lib/libzfs/common/libzfs_crypto.c ----------------------------------------- mcp-13 line 94 Why not use the ''else if'' construction that you used in the previous function? mcp-14 line 132 return (parse_locator(locator, s, len, uri)); mcp-15 line 150 If parse_format() fails, then format is uninitialized. mcp-16 line 194,217 s/generate/to generate/ mcp-17 line 228 s/memset(passphrase/memset(*passphrase/ mcp-18 line 231,240 Don''t you have to free *passphrase? mcp-19 lines 479-486 ''for'' loop candidate. mcp-20 line 567,585 s/10/''\n''/ mcp-21 line 625 I think you need to free outkey. mcp-22 line 822 Do you need to print a message? mcp-23 lines 861-883 I think you need to free ''cry'' if importing. mcp-24 line 1020 s/this/whether/ mcp-25 line 1130 Can''t parse first sentence. mcp-26 line 1188 Check that cry != NULL. You will no longer need the check on 1215. mcp-27 line 1315 Check that cry != NULL. You will no longer need the check on 1330. mcp-28 line 1510 s/validate/validated/ mcp-29 line 1539 Check that cry != NULL. mcp-30 line 1606 Check that cry != NULL.